X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=man%2FMakefile.am;h=1a74ac440dc4fe2c61f7385d1783e02b061232f1;hb=94a044f90357edefa6f4ae9f0b1d5885b0e34aee;hp=d0cd8a5e0ebab92f45a1aec40a3833fabdd789ce;hpb=d3b2175e084f88c8736ad7073eacbf4670147aec;p=debian%2Famanda

diff --git a/man/Makefile.am b/man/Makefile.am
index d0cd8a5..1a74ac4 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -2,21 +2,19 @@
 
 transform =	s,x,x,;
 
-if WANT_AMPLOT
-AMPLOT_MAN8_PAGES = amplot.8
-endif
-
-COMMON_MAN8_PAGES = amanda.8
+AMPLOT_MAN_PAGES =  amplot.8
 
-COMMON_MAN5_PAGES = amanda.conf.5 \
+COMMON_MAN_PAGES =  amanda.8 \
+		    amanda.conf.5 \
 		    amanda-client.conf.5
 
-#if WANT_SERVER
-SERVER_MAN8_PAGES = amadmin.8 \
+SERVER_MAN_PAGES =  amadmin.8 \
 		    amcheck.8 \
 		    amcheckdb.8 \
+		    amcheckdump.8 \
 		    amcleanup.8 \
 		    amdd.8 \
+		    amdevcheck.8 \
 		    amdump.8 \
 		    amflush.8 \
 		    amgetconf.8 \
@@ -31,40 +29,42 @@ SERVER_MAN8_PAGES = amadmin.8 \
 		    amtoc.8 \
 		    amverify.8 \
 		    amverifyrun.8 \
-		    amfetchdump.8 \
+		    amserverconfig.8 \
+		    amaddclient.8 \
+		    amcheckdump.8 \
 		    amcrypt.8 \
 		    amaespipe.8 \
+		    amgpgcrypt.8 \
+		    amcryptsimple.8  \
 		    amcrypt-ossl.8 \
 		    amcrypt-ossl-asym.8
-#endif
 
+RECOVER_MAN_PAGES =  amrecover.8
+
+RESTORE_MAN_PAGES =  amrestore.8 \
+		     amfetchdump.8
+
+ALL_MAN_PAGES = $(AMPLOT_MAN_PAGES) \
+	   $(COMMON_MAN_PAGES) \
+	   $(COMMON_MAN_PAGES) \
+	   $(SERVER_MAN_PAGES) \
+	   $(RECOVER_MAN_PAGES) \
+	   $(RESTORE_MAN_PAGES)
+
+WANTED_MAN_PAGES = $(COMMON_MAN_PAGES)
+if WANT_AMPLOT
+  WANTED_MAN_PAGES += $(AMPLOT_MAN_PAGES)
+endif
+if WANT_SERVER
+  WANTED_MAN_PAGES += $(SERVER_MAN_PAGES)
+endif
 if WANT_RECOVER
-RECOVER_MAN8_PAGES = amrecover.8
+  WANTED_MAN_PAGES += $(RECOVER_MAN_PAGES)
 endif
-
 if WANT_RESTORE
-RESTORE_MAN8_PAGES = amrestore.8
+  WANTED_MAN_PAGES += $(RESTORE_MAN_PAGES)
 endif
 
-man8_pages = $(COMMON_MAN8_PAGES) \
-	    $(AMPLOT_MAN8_PAGES) \
-	    $(SERVER_MAN8_PAGES) \
-	    $(RECOVER_MAN8_PAGES) \
-	    $(RESTORE_MAN8_PAGES)
-
-man5_pages = $(COMMON_MAN5_PAGES)
-
-ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) \
-	   $(COMMON_MAN5_PAGES) \
-	   $(COMMON_MAN8_PAGES) \
-	   $(SERVER_MAN8_PAGES) \
-	   $(RECOVER_MAN8_PAGES) \
-	   $(RESTORE_MAN8_PAGES)
-
-# These lines are needed to force automake to set the $man<n>dir variables.
-man5_MANS =
-man8_MANS =
-
 SRCMANPAGEDIR  = $(srcdir)/xml-source
 
 MAN_XML = $(ALL_MAN_PAGES:%=xml-source/%.xml)
@@ -87,64 +87,23 @@ xml-source/%.proc.xml: $(SRCMANPAGEDIR)/%.xml $(srcdir)/xslt/expand-sambadoc.xsl
 	$(XSLTPROC) $(XSLTPROC_FLAGS) --path $(srcdir)/xslt/ --xinclude --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --output $@ $(srcdir)/xslt/expand-sambadoc.xsl $<
 
 %: xml-source/%.proc.xml $(srcdir)/xslt/man.xsl
-	$(XSLTPROC) $(XSLTPROC_FLAGS) --path $(srcdir)/xslt/ --output $@ http://docbook.sourceforge.net/release/xsl/1.72.0/manpages/docbook.xsl $<
+	$(XSLTPROC) $(XSLTPROC_FLAGS) --path $(srcdir)/xslt/ --output $@ http://docbook.sourceforge.net/release/xsl/$(XSLREL)/manpages/docbook.xsl $<
 
 else	!ENABLE_MANPAGE_BUILD
 
 %: $(SRCMANPAGEDIR)/%.xml
 	@echo WARNING: Not building needed $@ because building manpages is disabled.
+	@echo 'DUMMY' > $@
+
 endif
 
-all: $(ALL_MAN_PAGES)
-
-# this is conditioned on ENABLE_MANPAGE_BUILD; it checks for the
-# existence of the file to be installed when building manpages is
-# not enabled.
-install-data-hook: $(ALL_MAN_PAGES)
-if	ENABLE_MANPAGE_BUILD
-	@list="$(man8_pages)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(man8dir)/`echo $$p|sed '$(transform)'`; \
-		echo $(INSTALL) -c -m 644 $$p $(DESTDIR)$(man8dir); \
-		$(INSTALL) -c -m 644 $$p $(DESTDIR)$(man8dir); \
-		echo chown \"$(BINARY_OWNER)\" $$pa;	\
-		chown "$(BINARY_OWNER)" $$pa;		\
-		echo chgrp \"$(SETUID_GROUP)\" $$pa;	\
-		chgrp "$(SETUID_GROUP)" $$pa;		\
-	done
-	@list="$(man5_pages)"; \
-	for p in $$list; do \
-		pa=$(DESTDIR)$(man5dir)/`echo $$p|sed '$(transform)'`; \
-		echo $(INSTALL) -c -m 644 $$p $(DESTDIR)$(man5dir); \
-		$(INSTALL) -c -m 644 $$p $(DESTDIR)$(man5dir); \
-		echo chown \"$(BINARY_OWNER)\" $$pa;	\
-		chown "$(BINARY_OWNER)" $$pa;		\
-		echo chgrp \"$(SETUID_GROUP)\" $$pa;	\
-		chgrp "$(SETUID_GROUP)" $$pa;		\
+# double-check that we don't ship dummy manpages
+dist-hook:
+	for f in $(WANTED_MAN_PAGES); do \
+		if sed -e 1q $(distdir)/$$f | $(GREP) '^DUMMY$$' >/dev/null 2>/dev/null; then \
+			echo "$(distdir)/$$f is a dummy manpage; cannot create distribution"; \
+			exit 1; \
+		fi; \
 	done
-else	!ENABLE_MANPAGE_BUILD
-	@list="$(man8_pages)"; \
-	for p in $$list; do \
-	    if test -e $$p; then \
-		pa=$(DESTDIR)$(man8dir)/`echo $$p|sed '$(transform)'`; \
-		echo $(INSTALL) -c -m 644 $$p $(DESTDIR)$(man8dir); \
-		$(INSTALL) -c -m 644 $$p $(DESTDIR)$(man8dir); \
-		echo chown \"$(BINARY_OWNER)\" $$pa;	\
-		chown "$(BINARY_OWNER)" $$pa;		\
-		echo chgrp \"$(SETUID_GROUP)\" $$pa;	\
-		chgrp "$(SETUID_GROUP)" $$pa;		\
-	    fi \
-	done
-	@list="$(man5_pages)"; \
-	for p in $$list; do \
-	    if test -e $$p; then \
-		pa=$(DESTDIR)$(man5dir)/`echo $$p|sed '$(transform)'`; \
-		echo $(INSTALL) -c -m 644 $$p $(DESTDIR)$(man5dir); \
-		$(INSTALL) -c -m 644 $$p $(DESTDIR)$(man5dir); \
-		echo chown \"$(BINARY_OWNER)\" $$pa;	\
-		chown "$(BINARY_OWNER)" $$pa;		\
-		echo chgrp \"$(SETUID_GROUP)\" $$pa;	\
-		chgrp "$(SETUID_GROUP)" $$pa;		\
-	    fi \
-	done
-endif
+
+man_MANS = $(WANTED_MAN_PAGES)