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

diff --git a/doc/automake.mk b/doc/automake.mk
index 26ff4e651a..6e14132f0c 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -6,7 +6,6 @@ doc_pspp_TEXINFOS = doc/version.texi \
 	doc/bugs.texi \
 	doc/command-index.texi \
 	doc/concept-index.texi \
-	doc/configuring.texi \
 	doc/data-io.texi \
 	doc/data-selection.texi \
 	doc/expressions.texi \
@@ -19,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 \
@@ -44,23 +44,44 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
 EXTRA_DIST += doc/pspp.man \
 	doc/get-commands.pl
 
-doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
+$(srcdir)/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 > $@
 
-doc/tut.texi:
+$(srcdir)/doc/tut.texi:
 	@$(MKDIR_P) doc
 	echo "@set example-dir $(examplesdir)" > $@
 
 
-doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
+# 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) $< -o - \
-		| $(SED) 's/Time-&-Date/Time-\&amp;-Date/g' > $@
+	$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
+		$(top_srcdir)/doc/pspp.texinfo -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' \
+	> $@
+	$(XMLLINT) --output /dev/null $@ || ( $(RM) $@ ; false)
 
 docbookdir = $(docdir)
-docbook_DATA = doc/pspp.xml
+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