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

diff --git a/Makefile.in b/Makefile.in
index 593daec..8f3d687 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,10 +1,11 @@
 #  userv - Makefile.in
 #  
-#  Copyright (C)1996-1997 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,58 +14,104 @@
 #  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@ $(XLDLIBS)
+LDLIBS=@DEBUGLIBS@ @LIBS@ $(XLDLIBS)
 
 M4=m4
 M4FLAGS=
 LEX=flex
+MD5SUM=@MD5SUM_SIMPLE@
 CWD=$(shell pwd)
 
+INSTALL_GROUP=0  # root or wheel
+INSTALL_FLAGS=-o root -g $(INSTALL_GROUP)
+
 INSTALL=@INSTALL@
-INSTALL_PROGRAM=@INSTALL_PROGRAM@
-INSTALL_DATA=@INSTALL_DATA@
+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=$(share_prefix)/doc/userv
+
+TARGETS=	daemon client
+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					\
 		overlord.c process.c servexec.c 			\
 		daemon.h debug.c parser.c lib.c lib.h			\
 		language.i4 lexer.l.m4 tokens.h.m4
-ALSOSHIP=	README INSTALL Changelog COPYING \
-		system.default system.override \
-		spec.sgml.in overview.fig overview.ps \
-		buildship install-sh .cvsignore
-GENSHIP=	lexer.l lexer.c tokens.h configure config.h.in \
-		spec.sgml spec.html spec.ps overview.ps
 
-SHIPTARGETS=	$(SOURCES) $(ALSOSHIP) $(GENSHIP)
+CONFIG_RESULTS=	config.status config.log config.h config.cache \
+		Makefile pcsum.h
+
+GENSHIP_CLEAN=	lexer.l lexer.c tokens.h config.h.in spec.sgml $(TARGETS_DOC)
+GENSHIP=	$(GENSHIP_CLEAN) configure
+
+all:		$(TARGETS)
 
-all:		daemon client
+docs:		$(TARGETS_DOC)
 
 install:	all
-		$(INSTALL_PROGRAM) -s -o root -g root -m 755 daemon $(sbindir)/uservd
-		$(INSTALL_PROGRAM) -s -o root -g root -m 4755 client $(bindir)/userv
-		$(INSTALL) -d -o root -g root -m 2755 $(etcsubdir) \
-	$(etcsubdir)/default.d $(etcsubdir)/services.d $(etcsubdir)/override.d
-		if ! test -f $(etcsubdir)/system.default; then \
-			$(INSTALL_DATA) -o root -g root system.default $(etcsubdir); fi
-		if ! test -f $(etcsubdir)/system.override; then \
-			$(INSTALL_DATA) -o root -g root 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 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-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)
@@ -95,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/../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
 
@@ -109,45 +158,38 @@ autoconf configure:
 		autoconf
 
 clean:
-		rm -f daemon client pcsum.h
+		find -name '*.orig' -o -name '*~' -o -name '.*~' \
+			-o -name '*#' -o -name '.#*' -o -name '*.bak' \
+			| xargs -r rm
+		rm -rf $(TARGETS) *.o core version.h
 		rm -f overview.eps
-		rm -f spec.lout* spec.text* spec.sgml spec.sgml.new spec.ps?*
-		rm -rf spec.html?*
-		rm -f lout.li *.lix *.ldx config.cache
-		rm -f *.o *~ core ./#*#
+		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/*
 
-distclean:	clean
-		rm -f config.status config.log Makefile config.h
+distclean mostlyclean:	clean
+		rm -f $(CONFIG_RESULTS)
 
-realclean:	distclean
-		rm -f spec.ps* spec.sgml spec.sgml.new
-		rm -f lexer.l lexer.c tokens.h overview.ps
-		rm -rf spec.html*
-
-totalclean:	realclean
-		rm -f configure config.h.in
-
-shipprep:	$(SHIPTARGETS)
-
-ship:		$(SHIPTARGETS)
-		rm -rf shipcheck
-		mkdir -p shipcheck/userv-$(VERSION)
-		cp -a $^ shipcheck/userv-$(VERSION)
-		cd shipcheck && \
-		 GZIP=-9v tar zvvcf userv-$(VERSION).tar.gz userv-$(VERSION)
-		rm -rf shipcheck/userv-$(VERSION)
+maintainer-clean:	distclean
+		rm -rf $(GENSHIP_CLEAN) spec.html/*.html
 
 linecount:	$(SOURCES)
 		wc -l $^
 
-%.html:		%.sgml
-		rm -rf $@; 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 $@