Somehow forgot to use $(IPROG) and $(IDATA) in this makefile.

[sgt/utils] / cvt-utf8 / Makefile

diff --git a/cvt-utf8/Makefile b/cvt-utf8/Makefile
index ead7b24..f4cdc89 100644 (file)
--- a/cvt-utf8/Makefile
+++ b/cvt-utf8/Makefile
@@ -4,9 +4,13 @@ DESTDIR = .
 # for `make install'
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
+SCRIPTDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/man/man1
+INSTALL = install
 
 all: cvt-utf8.1
+man: cvt-utf8.1
+progs:;
 
 %.1: %.but
        halibut --man=$@ $<
@@ -26,8 +30,10 @@ release: cvt-utf8.1
        tar -C reltmp -chzf $(DESTDIR)/cvt-utf8.tar.gz cvt-utf8
        rm -rf reltmp
 
-install: cvt-utf8.1
-       mkdir -p $(BINDIR)
-       install cvt-utf8 $(BINDIR)/cvt-utf8
+install: install-progs install-man
+install-progs:
+       mkdir -p $(SCRIPTDIR)
+       $(INSTALL) $(IPROG) cvt-utf8 $(SCRIPTDIR)/cvt-utf8
+install-man: cvt-utf8.1
        mkdir -p $(MANDIR)
-       install -m 0644 cvt-utf8.1 $(MANDIR)/cvt-utf8.1
+       $(INSTALL) $(IDATA) cvt-utf8.1 $(MANDIR)/cvt-utf8.1