Adjust 'after' so that it tries more rigorously to parse the input

[sgt/utils] / multi / Makefile

diff --git a/multi/Makefile b/multi/Makefile
index 3b7f2d6..b0a56be 100644 (file)
--- a/multi/Makefile
+++ b/multi/Makefile
@@ -4,9 +4,15 @@ DESTDIR = .
 # for `make install'
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
+SCRIPTDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/man/man1
+INSTALL = install
+IPROG =#   flags for installing programs (default none)
+IDATA = -m 0644  # flags for installing data
 
 all: multi.1
+man: multi.1
+progs:;
 
 %.1: %.but
        halibut --man=$@ $<
@@ -15,7 +21,8 @@ clean:
        rm -f *.1 *.html *.tar.gz
 
 html:
-       halibut --html=$(DESTDIR)/multi.html multi.but
+       halibut --html=multi.html multi.but
+       mv multi.html $(DESTDIR)
 
 release: multi.1
        mkdir -p reltmp/multi
@@ -26,8 +33,10 @@ release: multi.1
        tar -C reltmp -chzf $(DESTDIR)/multi.tar.gz multi
        rm -rf reltmp
 
-install: multi.1
-       mkdir -p $(BINDIR)
-       install multi $(BINDIR)/multi
+install: install-progs install-man
+install-progs:
+       mkdir -p $(SCRIPTDIR)
+       $(INSTALL) $(IPROG) multi $(SCRIPTDIR)/multi
+install-man: multi.1
        mkdir -p $(MANDIR)
-       install -m 0644 multi.1 $(MANDIR)/multi.1
+       $(INSTALL) $(IDATA) multi.1 $(MANDIR)/multi.1