Merge commit 'upstream/3.2.0'

[debian/amanda] / man / Makefile.am

diff --git a/man/Makefile.am b/man/Makefile.am
index 2525dee74a8f6e56f445081fab0250746fb2be4d..f43fcdcecd24696a430fd72594217fa27b63cd5d 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,7 @@
 # Makefile for amanda man-pages
 
+.SECONDARY:
+
 transform =    s,x,x,;
 
 AMPLOT_MAN_PAGES =  amplot.8
@@ -10,20 +12,26 @@ COMMON_MAN_PAGES =  amanda.8 \
                    amanda-scripts.7 \
                    amanda-archive-format.5 \
                    amanda-auth.7 \
+                   amanda-match.7 \
                    amarchiver.8 \
                    script-email.8
 
 CLIENT_MAN_PAGES = \
     amanda-applications.7 \
     amgtar.8 \
+    ampgsql.8 \
+    amraw.8 \
     amsamba.8 \
     amstar.8 \
+    amsuntar.8 \
     amzfs-snapshot.8 \
     amzfs-sendrecv.8
 
 SERVER_MAN_PAGES =  \
     amanda-devices.7 \
+    amanda-compatibility.7 \
     amanda-changers.7 \
+    amanda-taperscan.7 \
     amaddclient.8    \
     amadmin.8 \
     amaespipe.8 \
@@ -113,14 +121,14 @@ entities/global.entities: entities/global.entities.in $(top_builddir)/config.sta
 if   ENABLE_MANPAGE_BUILD
 # phase one of the documentation build expands some macros.
 xml-source/%.proc.xml: $(SRCMANPAGEDIR)/%.xml $(srcdir)/xslt/expand-sambadoc.xsl entities/global.entities
-       $(XSLTPROC) $(XSLTPROC_FLAGS) --path $(srcdir)/xslt/ --xinclude --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --output $@ $(srcdir)/xslt/expand-sambadoc.xsl $<
+       $(XSLTPROC) $(XSLTPROC_FLAGS) --path "$(srcdir)/xslt/:$(builddir)/entities/" --xinclude --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --output $@ $(srcdir)/xslt/expand-sambadoc.xsl $<
 
 # phase two generates a manpage from the resulting "expanded" docbook XML
 %: xml-source/%.proc.xml $(srcdir)/xslt/man.xsl entities/global.entities
-       $(XSLTPROC) $(XSLTPROC_FLAGS) --path $(srcdir)/xslt/ --output $@ xslt/man.xsl $<
+       $(XSLTPROC) $(XSLTPROC_FLAGS) --path "$(srcdir)/xslt/:$(builddir)/entities/" --output $@ xslt/man.xsl $<
 
 %.html: xml-source/%.proc.xml $(srcdir)/xslt/html.xsl entities/global.entities
-       $(XSLTPROC) $(XSLTPROC_FLAGS) --path $(srcdir)/xslt/ --output $@ xslt/html.xsl $<
+       $(XSLTPROC) $(XSLTPROC_FLAGS) --path "$(srcdir)/xslt/:$(builddir)/entities/" --output $@ xslt/html.xsl $<
 
 else   !ENABLE_MANPAGE_BUILD