X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=Makefile.in;h=6a65d7a9e590583d8c249fc7af8a035362fbf155;hp=58a4a5afbdcab284ee0272473bd321cff5cee445;hb=HEAD;hpb=bf70bf4bd61f77133984b7bb84d2ada358333796

diff --git a/Makefile.in b/Makefile.in
index 58a4a5a..8f3d687 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,10 +1,11 @@
 #  userv - Makefile.in
 #  
-#  Copyright (C)1996-1997,1999 Ian Jackson
+#  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
-#  the Free Software Foundation; either version 2 of the License, or
+#  the Free Software Foundation; either version 3 of the License, or
 #  (at your option) any later version.
 #  
 #  This program is distributed in the hope that it will be useful, but
@@ -13,14 +14,14 @@
 #  General Public License for more details.
 #  
 #  You should have received a copy of the GNU General Public License
-#  along with userv; if not, write to the Free Software
-#  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 VERSION=@VERSION@
 VEREXT=std
 
 CC=@CC@
-CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"' $(WERROR)
+CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"' $(WERROR) $(XCFLAGS)
 OPTIMISE=@OPTIMISE@
 CPPFLAGS=@DEBUGDEFS@ $(XCPPFLAGS)
 LDLIBS=@DEBUGLIBS@ @LIBS@ $(XLDLIBS)
@@ -28,25 +29,35 @@ LDLIBS=@DEBUGLIBS@ @LIBS@ $(XLDLIBS)
 M4=m4
 M4FLAGS=
 LEX=flex
+MD5SUM=@MD5SUM_SIMPLE@
 CWD=$(shell pwd)
 
-INSTALL_GROUP=root
+INSTALL_GROUP=0  # root or wheel
 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
 bindir=$(exec_prefix)/bin
+mandir=$(share_prefix)/man
+man1dir=$(mandir)/man1
+man8dir=$(mandir)/man8
 sbindir=$(exec_prefix)/sbin
 etcdir=/etc
 etcsubdir=$(etcdir)/userv
-docdir=$(prefix)/userv
+docdir=$(share_prefix)/doc/userv
 
 TARGETS=	daemon client
-TARGETS_DOC_PS=	spec.ps overview.ps
-TARGETS_DOC=	spec.html $(TARGETS_DOC_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
+MAN8PAGES=	uservd.8
 
 SOURCES=	Makefile.in configure.in acconfig.h			\
 		client.c common.h					\
@@ -65,28 +76,42 @@ all:		$(TARGETS)
 docs:		$(TARGETS_DOC)
 
 install:	all
-		$(INSTALL_PROGRAM) -m 755 daemon $(sbindir)/uservd
-		$(INSTALL_PROGRAM) -m 4755 client $(bindir)/userv
-		$(INSTALL) -d -m 2755 $(etcsubdir) \
-	$(etcsubdir)/default.d $(etcsubdir)/services.d $(etcsubdir)/override.d
-		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_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_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
 
 install-strip:
 		$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
-install-doc:	$(TARGETS_DOC)
-		$(INSTALL) -d -m 2755 $(docdir) $(docdir)/spec.html
-		$(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(docdir)/.
-		$(INSTALL_DATA) -m 644 spec.html/*.html $(docdir)/spec.html/.
+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:
-		cd $docdir && rm -rf $(TARGETS_DOC)
+uninstall-doc uninstall-docs:
+		cd $docdir && rm -rf $(TARGETS_DOC_RM)
+
+check:
+		@echo There is no validation suite for this package.
 
 daemon:		overlord.o process.o servexec.o parserlexer.o debug.o lib.o both.o
 		$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
@@ -117,7 +142,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
 
@@ -126,8 +153,6 @@ version.h:	Makefile
 
 tokens.h:	language.i4
 
-		rm -f *.o *~ core ./#*#
-
 autoconf configure:
 		autoheader
 		autoconf
@@ -136,9 +161,9 @@ clean:
 		find -name '*.orig' -o -name '*~' -o -name '.*~' \
 			-o -name '*#' -o -name '.#*' -o -name '*.bak' \
 			| xargs -r rm
-		rm -rf $(TARGETS) *.o version.h
+		rm -rf $(TARGETS) *.o core version.h
 		rm -f overview.eps
-		rm -f spec.lout* spec.text* spec.ps?* spec.sgml.new
+		rm -f spec.lout* spec.text* spec.ps* spec.sgml.new spec.tex
 		rm -f lout.li *.ld *.lix *.ldx
 		rm -f userv-*.tar.gz vd/*
 
@@ -148,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 $^
 
-%.html:		%.sgml
-		debiandoc2html $<
+%.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 $@