Merge "output" into "master"

[pspp] / doc / automake.mk

diff --git a/doc/automake.mk b/doc/automake.mk
index 26ff4e651a7e0718ebef8e60f292d4c96c5fcb07..7645925bddf83cb65de71550ea5ff1fcd3d540d5 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -6,7 +6,6 @@ doc_pspp_TEXINFOS = doc/version.texi \
        doc/bugs.texi \
        doc/command-index.texi \
        doc/concept-index.texi \
-       doc/configuring.texi \
        doc/data-io.texi \
        doc/data-selection.texi \
        doc/expressions.texi \
@@ -55,12 +54,14 @@ doc/tut.texi:
 
 doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
        @$(MKDIR_P)  doc
-       $(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) $< -o - \
+       $(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
+               $(top_srcdir)/doc/pspp.texinfo -o - \
                | $(SED) 's/Time-&-Date/Time-\&amp;-Date/g' > $@
+       $(XMLLINT) --output /dev/null $@ 2>&1 2> /dev/null || ( $(RM) $@ && false )
 
 docbookdir = $(docdir)
 docbook_DATA = doc/pspp.xml
-
+EXTRA_DIST += doc/pspp.xml
 
 EXTRA_DIST += doc/OChangeLog
 CLEANFILES += pspp-dev.dvi $(docbook_DATA)