X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile.in;h=8f3d687b3543bb001bd85a954713eda6d5e1924f;hb=7adf2c71251abac86b93cbd21914acccac295575;hp=6221dabd0b9491fc3dc038b31dd30d738d1f3796;hpb=3dbf9f5f6a117f80243cdd2f21669f8266347de8;p=userv.git

diff --git a/Makefile.in b/Makefile.in
index 6221dab..8f3d687 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,7 @@
 #  userv - Makefile.in
 #  
-#  userv is
-#  Copyright 1996-2017 Ian Jackson <ian@davenant.greenend.org.uk>.
-#  Copyright 2000      Ben Harris <bjh21@cam.ac.uk>
-#  Copyright 2016-2017 Peter Benie <pjb1008@cam.ac.uk>
+#  userv is copyright Ian Jackson and other contributors.
+#  See README for full authorship information.
 #  
 #  This is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by
@@ -40,6 +38,8 @@ INSTALL_FLAGS=-o root -g $(INSTALL_GROUP)
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_FLAGS)
 INSTALL_DATA=@INSTALL_DATA@ $(INSTALL_FLAGS)
+INSTALL_DIR=$(INSTALL) -d
+INSTALL_DIR_ETC=$(INSTALL_DIR)
 prefix=@prefix@
 exec_prefix=$(prefix)
 share_prefix=$(prefix)/share
@@ -53,7 +53,7 @@ etcsubdir=$(etcdir)/userv
 docdir=$(share_prefix)/doc/userv
 
 TARGETS=	daemon client
-TARGETS_DOC_PS=	spec.ps overview.ps
+TARGETS_DOC_PS=	spec.pdf overview.pdf
 TARGETS_DOC_RM=	$(TARGETS_DOC_PS) spec.html
 TARGETS_DOC=	$(TARGETS_DOC_PS) spec.html/index.html
 MAN1PAGES=	userv.1
@@ -76,31 +76,38 @@ all:		$(TARGETS)
 docs:		$(TARGETS_DOC)
 
 install:	all
-		$(INSTALL_PROGRAM) -m 755 daemon $(sbindir)/uservd
-		$(INSTALL_PROGRAM) -m 4755 client $(bindir)/userv
+		$(INSTALL_DIR) $(addprefix $(DESTDIR), $(bindir) $(sbindir))
+		$(INSTALL_PROGRAM) -m 755 daemon $(DESTDIR)$(sbindir)/uservd
+		$(INSTALL_PROGRAM) -m 4755 client $(DESTDIR)$(bindir)/userv
 		set -e; for f in '' /default.d /services.d /override.d; do \
-			$(INSTALL) -d -m 2755 $(etcsubdir)$$f; 		\
+			$(INSTALL_DIR_ETC) $(DESTDIR)$(etcsubdir)$$f; \
+		done
+		set -e; for f in system.default system.override; do	\
+			if test ! -f $(DESTDIR)$(etcsubdir)/$$f; then	\
+				$(INSTALL_DATA) $$f $(DESTDIR)$(etcsubdir); \
+			fi;						\
 		done
-		if test ! -f $(etcsubdir)/system.default; then \
-			$(INSTALL_DATA) system.default $(etcsubdir); fi
-		if test ! -f $(etcsubdir)/system.override; then \
-			$(INSTALL_DATA) system.override $(etcsubdir); fi
 
 install-strip:
 		$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
-install-doc:	$(TARGETS_DOC)
-		$(INSTALL) -d -m 2755 $(docdir) $(docdir)/spec.html
-		$(INSTALL) -d -m 2755 $(mandir) $(man1dir) $(man8dir)
-		$(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(docdir)/.
-		$(INSTALL_DATA) -m 644 spec.html/*.html $(docdir)/spec.html/.
-		$(INSTALL_DATA) -m 644 $(MAN1PAGES) $(man1dir)
-		$(INSTALL_DATA) -m 644 $(MAN8PAGES) $(man8dir)
+install-doc install-docs:	$(TARGETS_DOC)
+		$(INSTALL_DIR) $(addprefix $(DESTDIR), 			\
+			$(docdir) $(docdir)/spec.html $(docdir)/examples \
+			$(mandir) $(man1dir) $(man8dir)			\
+		)
+		$(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(DESTDIR)$(docdir)/.
+		$(INSTALL_DATA) -m 644 spec.html/*.html \
+			$(DESTDIR)$(docdir)/spec.html/.
+		$(INSTALL_DATA) -m 644 system.default system.override \
+			$(DESTDIR)$(docdir)/examples/.
+		$(INSTALL_DATA) -m 644 $(MAN1PAGES) $(DESTDIR)$(man1dir)
+		$(INSTALL_DATA) -m 644 $(MAN8PAGES) $(DESTDIR)$(man8dir)
 
 uninstall:
 		rm -f $(bindir)/userv $(sbindir)/uservd
 
-uninstall-doc:
+uninstall-doc uninstall-docs:
 		cd $docdir && rm -rf $(TARGETS_DOC_RM)
 
 check:
@@ -166,36 +173,23 @@ distclean mostlyclean:	clean
 maintainer-clean:	distclean
 		rm -rf $(GENSHIP_CLEAN) spec.html/*.html
 
-dist-prep:	$(GENSHIP)
-
-pre-checkin:
-		./configure
-		$(MAKE) dist-prep
-
-dist_tmp=dist_tmp/userv-$(VERSION)
-dist_prune=\( -name CVS -o -name 'dist_tmp*' -o -name slash-etc -o -name vd \)
-dist:			dist-prep distclean
-	rm -rf dist_tmp*
-	mkdir dist_tmp $(dist_tmp)
-	find $(dist_prune) -prune -o -type d -print | \
-		sed -e 's#.*#mkdir -p $(dist_tmp)/&#' | sh
-	find $(dist_prune) -prune -o -type f -print | \
-		sed -e 's#.*#ln & $(dist_tmp)/&#' | sh
-	cd dist_tmp && tar cf ../$(dist_tmp).tar `basename $(dist_tmp)`
-	gzip -9 $(dist_tmp).tar
-	mv $(dist_tmp).tar.gz .
-
 linecount:	$(SOURCES)
 		wc -l $^
 
+%.dbk:		%.sgml
+		debiandoc2dbk -1 $<
+
 %.html/index.html:	%.sgml
 			debiandoc2html $<
 
-%.ps:		%.sgml
-		debiandoc2ps -1 -O $< >$@.new && mv $@.new $@
+%.pdf:		%.dbk
+		dblatex -b xetex $<
+		mv -f $<.pdf $@
 
-%.ps:		%.fig
-		fig2dev -L ps -c -l dummy -P -z A4 $< >$@.new && mv $@.new $@
+overview.pdf:	overview.fig
+		SOURCE_DATE_EPOCH=$$(stat -c %Y overview.fig) \
+		fig2dev -L pdf -c -F -l dummy_arg -z A4 $< >$@.new
+		mv $@.new $@
 
 %.l:		%.l.m4
 		$(M4) $(M4FLAGS) -- $< >$@.new && mv $@.new $@