X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=7e3c5d49372d9974da9b87b075e1f887547889ee;hb=8b85e5c61350e0cee32236ecacc4c7c665188396;hp=4e1b3ff349595cac520255b711f55b8010a0f5f0;hpb=9c99f9d21cb56f29e576d9eb91b2cc9ec8fed0f0;p=pspp

diff --git a/doc/automake.mk b/doc/automake.mk
index 4e1b3ff349..7e3c5d4937 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -41,6 +41,7 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
 	doc/dev/system-file-format.texi \
 	doc/dev/pc+-file-format.texi \
 	doc/dev/portable-file-format.texi \
+	doc/dev/spv-file-format.texi \
 	doc/dev/encrypted-file-wrappers.texi \
 	doc/dev/q2c.texi
 
@@ -58,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) doc/help-pages-list
+$(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-\&-Date/g' \
-		-e 's/“/\“/g' \
-		-e 's/”/\”/g' \
-		-e 's/‘/\‘/g' \
-		-e 's/’/\’/g' \
-		-e 's/—/\—/g' \
-		-e 's/–/\′/g' \
-                -e 's/é/\é/g' \
-		-e 's/©/\©/g' \
-		-e 's/−/\−/g' \
-		-e 's/…/\…/g' \
-		-e 's/•/\ߦ/g' \
-		-e 's/././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 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