X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=Makefile.in;h=90972fd4717b2a74eb6277b0fc747d36e0a655af;hp=eb162513118cb847dc678c4fa72ce6f2bcc668c7;hb=dc9e0a48601e4dc7b3060c1e816692f07e6be095;hpb=a68bf830adf982141dc41b44ee7a66dafd45ae9f

diff --git a/Makefile.in b/Makefile.in
index eb16251..90972fd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,6 +28,7 @@ LDLIBS=@DEBUGLIBS@ @LIBS@ $(XLDLIBS)
 M4=m4
 M4FLAGS=
 LEX=flex
+MD5SUM=@MD5SUM_SIMPLE@
 CWD=$(shell pwd)
 
 INSTALL_GROUP=root
@@ -39,6 +40,8 @@ INSTALL_DATA=@INSTALL_DATA@ $(INSTALL_FLAGS)
 prefix=@prefix@
 exec_prefix=$(prefix)
 bindir=$(exec_prefix)/bin
+mandir=$(prefix)/man
+man1dir=$(mandir)/man1
 sbindir=$(exec_prefix)/sbin
 etcdir=/etc
 etcsubdir=$(etcdir)/userv
@@ -46,7 +49,9 @@ docdir=$(prefix)/userv
 
 TARGETS=	daemon client
 TARGETS_DOC_PS=	spec.ps overview.ps
-TARGETS_DOC=	spec.html $(TARGETS_DOC_PS)
+TARGETS_DOC_RM=	$(TARGETS_DOC_PS) spec.html
+TARGETS_DOC=	$(TARGETS_DOC_PS) spec.html/index.html
+MAN1PAGES=	userv.1
 
 SOURCES=	Makefile.in configure.in acconfig.h			\
 		client.c common.h					\
@@ -79,14 +84,16 @@ install-strip:
 
 install-doc:	$(TARGETS_DOC)
 		$(INSTALL) -d -m 2755 $(docdir) $(docdir)/spec.html
+		$(INSTALL) -d -m 2755 $(mandir) $(man1dir)
 		$(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(docdir)/.
 		$(INSTALL_DATA) -m 644 spec.html/*.html $(docdir)/spec.html/.
+		$(INSTALL_DATA) -m 644 $(MAN1PAGES) $(man1dir)
 
 uninstall:
 		rm -f $(bindir)/userv $(sbindir)/uservd
 
 uninstall-doc:
-		cd $docdir && rm -rf $(TARGETS_DOC)
+		cd $docdir && rm -rf $(TARGETS_DOC_RM)
 
 daemon:		overlord.o process.o servexec.o parserlexer.o debug.o lib.o both.o
 		$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
@@ -117,7 +124,9 @@ parserlexer.o:	lexer.c parser.c config.h common.h pcsum.h daemon.h lib.h tokens.
 		$(CC) -c $(CPPFLAGS) $(CFLAGS) lexer.c -o $@
 
 pcsum.h:	common.h config.h config.status Makefile
-		cat $^ | md5sum | sed -e 's/  -$$//; s/../0x&,/g; s/,$$//;' >pcsum.h.new
+		cat $^ | $(MD5SUM) \
+			| sed -e 's/  -$$//; s/../0x&,/g; s/,$$//;' \
+			>pcsum.h.new
 		cmp pcsum.h.new pcsum.h || mv -f pcsum.h.new pcsum.h
 		@rm -f pcsum.h.new
 
@@ -168,8 +177,8 @@ dist:			dist-prep distclean
 linecount:	$(SOURCES)
 		wc -l $^
 
-%.html:		%.sgml
-		debiandoc2html $<
+%.html/index.html:	%.sgml
+			debiandoc2html $<
 
 %.ps:		%.sgml
 		debiandoc2ps -1 -O $< >$@.new && mv $@.new $@