X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=6e14132f0c8b41372887f41d9a1f4a8a8b108590;hb=8925b93f70213a7b88521ea134d0c7daf18bb1a5;hp=fe8abd764f9b370ccec9861e49d7ce9d3e31b666;hpb=41b3a284bf8d4e10fcdef846154ddf27835b82bd;p=pspp

diff --git a/doc/automake.mk b/doc/automake.mk
index fe8abd764f..6e14132f0c 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -18,6 +18,7 @@ doc_pspp_TEXINFOS = doc/version.texi \
 	doc/invoking.texi \
 	doc/language.texi \
 	doc/license.texi \
+	doc/pspp-convert.texi \
 	doc/ni.texi \
 	doc/not-implemented.texi \
 	doc/statistics.texi \
@@ -52,6 +53,8 @@ $(srcdir)/doc/tut.texi:
 	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.texinfo $(doc_pspp_TEXINFOS)
 	@$(MKDIR_P)  doc
 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
@@ -67,12 +70,18 @@ $(srcdir)/doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
 		-e 's/©/\©/g' \
 		-e 's/−/\−/g' \
 		-e 's/…/\…/g' \
+		-e 's/•/\ߦ/g' \
 		-e 's/././g' \
-		> $@
-	$(XMLLINT) --output /dev/null $@ 2>&1 2> /dev/null || ( $(RM) $@ && false )
+		-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' \
+	> $@
+	$(XMLLINT) --output /dev/null $@ || ( $(RM) $@ ; false)
 
 docbookdir = $(docdir)
 dist_docbook_DATA = doc/pspp.xml
+ 
 
-EXTRA_DIST += doc/OChangeLog
 CLEANFILES += pspp-dev.dvi $(docbook_DATA)
+
+doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA)
+.PHONY: doc