doc: Distribute doc/pspp.xml, so that users don't need makeinfo or xmllint.

[pspp-builds.git] / doc / automake.mk

diff --git a/doc/automake.mk b/doc/automake.mk
index 9402d7af0aea98ab731007f7b905f251973c13f3..504fb8a7bd7522ef1a74335d5392f60087f5c387 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -46,7 +46,7 @@ EXTRA_DIST += doc/pspp.man \
 
 doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
        @$(MKDIR_P)  doc
-       @PERL@ $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
+       $(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
 
 doc/tut.texi:
        @$(MKDIR_P) doc
@@ -55,12 +55,14 @@ doc/tut.texi:
 
 doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
        @$(MKDIR_P)  doc
-       $(MAKEINFO) --docbook -I $(top_srcdir) $< -o $@
-       $(SED) -i -e 's/Time-&-Date/Time-\&amp;-Date/g' $@
+       $(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)