X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=doc%2Fautomake.mk;h=6e14132f0c8b41372887f41d9a1f4a8a8b108590;hb=refs%2Fheads%2Fcenter-titles;hp=3445379a1ca756e00e62751623ab4759cdf12dc0;hpb=625011da0d7cfcc4536fd95bad7f0da7c7750b81;p=pspp

diff --git a/doc/automake.mk b/doc/automake.mk
index 3445379a1c..6e14132f0c 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -6,11 +6,11 @@ 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 \
 	doc/files.texi \
+	doc/combining.texi \
 	doc/flow-control.texi \
 	doc/function-index.texi \
 	doc/installing.texi \
@@ -18,10 +18,13 @@ 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 \
 	doc/transformation.texi \
+	doc/tutorial.texi \
+	doc/tut.texi \
 	doc/regression.texi \
 	doc/utilities.texi \
 	doc/variables.texi \
@@ -32,6 +35,7 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
 	doc/dev/concepts.texi \
 	doc/dev/syntax.texi \
 	doc/dev/data.texi \
+	doc/dev/i18n.texi \
 	doc/dev/output.texi \
 	doc/dev/system-file-format.texi \
 	doc/dev/portable-file-format.texi \
@@ -40,26 +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 > $@
+	$(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
 
-# It seems that recent versions of yelp, upon which the gui relies to display the reference
-# manual, are broken.  It only works on compressed info files.  So we must compress them.
-if WITHGUI
-YELP_CHECK = yelp-check
-else
-YELP_CHECK =
-endif
-install-data-hook:: $(YELP_CHECK)
-	for ifile in $(DESTDIR)$(infodir)/pspp.info-[0-9] \
-		$(DESTDIR)$(infodir)/pspp.info  ; do \
-	  gzip -f $$ifile ; \
-	done
+$(srcdir)/doc/tut.texi:
+	@$(MKDIR_P) doc
+	echo "@set example-dir $(examplesdir)" > $@
 
-uninstall-hook::
-	rm -f $(DESTDIR)$(infodir)/pspp.info-[0-9].gz
-	rm -f $(DESTDIR)$(infodir)/pspp.info.gz
 
-EXTRA_DIST += doc/OChangeLog
-CLEANFILES += pspp-dev.dvi
+# 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) \
+		$(top_srcdir)/doc/pspp.texinfo -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' \
+	> $@
+	$(XMLLINT) --output /dev/null $@ || ( $(RM) $@ ; false)
+
+docbookdir = $(docdir)
+dist_docbook_DATA = doc/pspp.xml
+ 
+
+CLEANFILES += pspp-dev.dvi $(docbook_DATA)
+
+doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA)
+.PHONY: doc