Add XML files to distribution

diff --git a/configure.ac b/configure.ac
index ade3cf6c94f71e3a9f015c8f4ede2c4dbf3ee941..c5b18c173bf8748a7880d57cc9dfee9dbc0e23da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -251,9 +251,11 @@ AC_OUTPUT([Makefile
        doc/Makefile
     doc/html.xsl
     doc/man.xsl
+    doc/manual/Makefile
     doc/manual/manual.xml
     doc/manpages/Makefile
     doc/manpages/man1/Makefile
+    doc/manpages/man5/Makefile
     doc/manpages/man8/Makefile
        etc/Makefile
        etc/afpd/Makefile

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e4e156e30dd5488c7cca5cddef2263428d97bccf..e1b356f1a8b62786d6131a5023817d902ef90c66 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS =
+SUBDIRS = manpages manual
 XSLTPROC=@XSLTPROC@
 XSLTPROC_FLAGS=@XSLTPROC_FLAGS@
 XHTML_STYLESHEET=$(top_srcdir)/doc/html.xsl
@@ -6,9 +6,4 @@ XHTML_STYLESHEET=$(top_srcdir)/doc/html.xsl
 htmldir = $(prefix)/share/doc/@PACKAGE@
 dist_html_DATA = @PACKAGE@.html
 
-if HAVE_XSLTPROC
-       SUBDIRS += manpages
-endif
-
-distclean-local:
-       $(RM) -f $(top_builddir)/doc/html.xsl $(top_builddir)/doc/html.xsl $(top_builddir)/doc/manual/manual.xml
+DISTCLEANFILES = html.xsl man.xsl

diff --git a/doc/manpages/man1/Makefile.am b/doc/manpages/man1/Makefile.am
index 7c750e318fcd7ba6900eea65d64495d0c3acd779..dc3d65898cd0cbf553d601cac03ff0cf4aee9e99 100644 (file)
--- a/doc/manpages/man1/Makefile.am
+++ b/doc/manpages/man1/Makefile.am
@@ -1,6 +1,7 @@
 XSLTPROC=@XSLTPROC@
 XSLTPROC_FLAGS=@XSLTPROC_FLAGS@
 MAN_STYLESHEET=$(top_srcdir)/doc/man.xsl
+CLEANFILES =
 
 MAN_MANPAGES = \
        ad.1 \
@@ -15,10 +16,25 @@ MAN_MANPAGES = \
        netatalk-config.1 \
        uniconv.1
 
-CLEANFILES = $(MAN_MANPAGES)
+EXTRA_DIST = \
+       ad.1.xml \
+       afpldaptest.1.xml \
+       afppasswd.1.xml \
+       afpstats.1.xml \
+       apple_dump.1.xml \
+       asip-status.pl.1.xml \
+       dbd.1.xml \
+       macusers.1.xml \
+       megatron.1.xml \
+       netatalk-config.1.xml \
+       uniconv.1.xml
+
+if HAVE_XSLTPROC
+CLEANFILES += $(MAN_MANPAGES)
 
 %.1 : $(MAN_STYLESHEET) %.1.xml
        @xsltproc $(MAN_STYLESHEET) $<
        @cp $@ $(top_builddir)/man/man1/$@.in
 
 html-local: $(MAN_MANPAGES)
+endif
\ No newline at end of file

diff --git a/doc/manpages/man5/Makefile.am b/doc/manpages/man5/Makefile.am
index 0188bcacfd3af6e832599679211b06bef6ff398e..82fee7c110334c8db899a405ca9393c46a3f44d7 100644 (file)
--- a/doc/manpages/man5/Makefile.am
+++ b/doc/manpages/man5/Makefile.am
@@ -1,6 +1,7 @@
 XSLTPROC=@XSLTPROC@
 XSLTPROC_FLAGS=@XSLTPROC_FLAGS@
 MAN_STYLESHEET=$(top_srcdir)/doc/man.xsl
+CLEANFILES =
 
 MAN_MANPAGES = \
        afp.conf.5 \
@@ -8,10 +9,18 @@ MAN_MANPAGES = \
        afp_voluuid.conf.5 \
        extmap.conf.5
 
-CLEANFILES = $(MAN_MANPAGES)
+EXTRA_DIST = \
+       afp_signature.conf.5.xml \
+       afp_voluuid.conf.5.xml \
+       afp.conf.5.xml \
+       extmap.conf.5.xml
+
+if HAVE_XSLTPROC
+CLEANFILES += $(MAN_MANPAGES)
 
 %.5 : $(MAN_STYLESHEET) %.5.xml
        @xsltproc $(MAN_STYLESHEET) $<
        @cp $@ $(top_builddir)/man/man5/$@.in
 
 html-local: $(MAN_MANPAGES)
+endif
\ No newline at end of file

diff --git a/doc/manpages/man8/Makefile.am b/doc/manpages/man8/Makefile.am
index cf6c1f271fc684516f6bc229431a8d3e1dd0df83..3f23a7847817b7891870265948ce9b5a773dcdbc 100644 (file)
--- a/doc/manpages/man8/Makefile.am
+++ b/doc/manpages/man8/Makefile.am
@@ -1,6 +1,7 @@
 XSLTPROC=@XSLTPROC@
 XSLTPROC_FLAGS=@XSLTPROC_FLAGS@
 MAN_STYLESHEET=$(top_srcdir)/doc/man.xsl
+CLEANFILES =
 
 MAN_MANPAGES = \
        afpd.8 \
@@ -8,10 +9,18 @@ MAN_MANPAGES = \
        cnid_metad.8 \
        netatalk.8
 
-CLEANFILES = $(MAN_MANPAGES)
+EXTRA_DIST = \
+       afpd.8.xml \
+       cnid_dbd.8.xml \
+       cnid_metad.8.xml \
+       netatalk.8.xml
+
+if HAVE_XSLTPROC
+CLEANFILES += $(MAN_MANPAGES)
 
 %.8 : $(MAN_STYLESHEET) %.8.xml
        @xsltproc $(MAN_STYLESHEET) $<
        @cp $@ $(top_builddir)/man/man8/$@.in
 
 html-local: $(MAN_MANPAGES)
+endif
\ No newline at end of file

diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
new file mode 100644 (file)
index 0000000..7f2b61d
--- /dev/null
+++ b/doc/manual/Makefile.am
@@ -0,0 +1,7 @@
+EXTRA_DIST = \
+       configuration.xml \
+       install.xml \
+       intro.xml \
+       upgrade.xml
+
+DISTCLEANFILES = manual.xml