configure: Entirely avoid broken Texinfo.

[pspp] / doc / automake.mk

diff --git a/doc/automake.mk b/doc/automake.mk
index 28866ca2e9196eb46143842cb7b1d3a95ba24483..7e3c5d49372d9974da9b87b075e1f887547889ee 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -45,20 +45,6 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
        doc/dev/encrypted-file-wrappers.texi \
        doc/dev/q2c.texi
 
-if HAVE_DOT
-$(PDFS): doc/dev/spv-structure.pdf
-$(srcdir)/doc/dev/spv-structure.pdf: doc/dev/spv-structure.gv
-       dot -Tpdf < $< > $@
-
-$(DVIS): doc/dev/spv-structure.eps
-$(srcdir)/doc/dev/spv-structure.eps: doc/dev/spv-structure.gv
-       dot -Teps < $< > $@
-endif
-EXTRA_DIST += \
-       doc/dev/spv-structure.gv \
-       doc/dev/spv-structure.pdf \
-       doc/dev/spv-structure.eps
-
 dist_man_MANS += doc/pspp.1 \
                  doc/psppire.1
 
@@ -73,35 +59,14 @@ $(srcdir)/doc/tut.texi:
        $(AM_V_GEN)echo "@set example-dir $(examplesdir)" > $@
 
 
-# The SED and AWK filters in this rule, are to work-around some nasty bugs in 
-# makeinfo version 4.13, which produces broken docbook xml.  These workarounds 
-# are rather horrible and must be removed asap.
 $(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) $(top_srcdir)/doc/help-pages-list
+if BROKEN_DOCBOOK_XML
+       touch $@
+else
        @$(MKDIR_P)  doc
        $(AM_V_GEN)$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
-               $(top_srcdir)/doc/pspp.texi -o - \
-               | $(SED) -e 's/Time-&-Date/Time-\&amp;-Date/g' \
-               -e 's/&ldquo;/\&#8220;/g' \
-               -e 's/&rdquo;/\&#8221;/g' \
-               -e 's/&lsquo;/\&#8216;/g' \
-               -e 's/&rsquo;/\&#8217;/g' \
-               -e 's/&mdash;/\&#8212;/g' \
-               -e 's/&ndash;/\&#8242;/g' \
-                -e 's/&eacute;/\&#0233;/g' \
-               -e 's/&copy;/\&#0169;/g' \
-               -e 's/&minus;/\&#8722;/g' \
-               -e 's/&hellip;/\&#8230;/g' \
-               -e 's/&bull;/\&#2022;/g' \
-               -e 's/&period;/./g' \
-               -e 's%\(<figure [^>]*\)>%\1/>%g' \
-        | $(AWK) '/<para>.*<table.*>.*<\/para>/{x=sub("</para>",""); print; s=1;next}/<\/table>/{print; if (s==1) print "</para>"; s=0; next}1' \
-       > $@,tmp
-       $(AM_V_at)$(XMLLINT) --output /dev/null $@,tmp
-       $(AM_V_at)cat $(top_srcdir)/doc/help-pages-list | while read node ; do \
-        $(XMLLINT) --xpath "$$node" $@,tmp > /dev/null; \
-        if test $$? -ne 0 ; then  echo "$$node does not appear in $@" ; exit 1; fi ; \
-        done 
-       mv $@,tmp $@
+               $< -o $@
+endif
 
 docbookdir = $(docdir)
 dist_docbook_DATA = doc/pspp.xml