Fix fault XML in documentation.

Avoid broken XML generated by Texinfo. Add a make rule
to check for this in the future.

diff --git a/configure.ac b/configure.ac
index 1ef538bca60ae2c120a433df8aca080f616e5963..dad55e2cb032ad1b0e7ef5f57504eadfb72f2672 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,8 @@ required_gtk_version=2.12
 if test x"$with_gui" != x"no" ; then 
   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,,
     [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v$required_gtk_version or later (or use --without-gui)])])
+  AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH])
+  AC_SUBST(XMLLINT)
 fi
 AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 

diff --git a/doc/automake.mk b/doc/automake.mk
index b24eb51e7e6c5458fc0ae726fc7a92e0f46a74eb..0963e1fd14889ec707a20329ef55662238356497 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -58,6 +58,7 @@ doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
        $(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
                $(top_srcdir)/doc/pspp.texinfo -o - \
                | $(SED) 's/Time-&-Date/Time-\&-Date/g' > $@
+       $(XMLLINT) --output /dev/null $@ 2>&1 2> /dev/null || ( $(RM) $@ && false )
 
 docbookdir = $(docdir)
 docbook_DATA = doc/pspp.xml

diff --git a/doc/pspp.texinfo b/doc/pspp.texinfo
index 562b328dbab3bb595574c9ee804d66703dc1d407..830e82e4619393ac8c6c9512eb5fe079842e6830 100644 (file)
--- a/doc/pspp.texinfo
+++ b/doc/pspp.texinfo
@@ -65,9 +65,8 @@ modify this GNU manual.''
 @insertcopying
 @end titlepage
 
-@chapheading Acknowledgements
-The authors wish to thank
-Network Theory Ltd 
+@c @chapheading Acknowledgements
+The authors wish to thank Network Theory Ltd 
 @url{http://www.network-theory.co.uk}
 for their financial support 
 in the production of this manual.