X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=e02f1f4c68d0217a280cad777b6f7721451a512c;hb=cf039918a493868e3b777575b2bc504c3adbb9d5;hp=c571a236d2fc240d8bd841a2ade937ae2791158d;hpb=5dbf5abcbed01f04422d4dead1c0ae0bb7efde4f;p=pspp

diff --git a/doc/automake.mk b/doc/automake.mk
index c571a236d2..e02f1f4c68 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -1,3 +1,19 @@
+## PSPP - a program for statistical analysis.
+## Copyright (C) 2019 Free Software Foundation, Inc.
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 info_TEXINFOS = doc/pspp.texi doc/pspp-dev.texi
@@ -19,6 +35,7 @@ doc_pspp_TEXINFOS = doc/version.texi \
 	doc/language.texi \
 	doc/license.texi \
 	doc/pspp-convert.texi \
+	doc/pspp-output.texi \
 	doc/pspp-dump-sav.texi \
 	doc/ni.texi \
 	doc/not-implemented.texi \
@@ -29,7 +46,7 @@ doc_pspp_TEXINFOS = doc/version.texi \
 	doc/regression.texi \
 	doc/utilities.texi \
 	doc/variables.texi \
-	doc/fdl.texi 
+	doc/fdl.texi
 
 doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
 	doc/dev/intro.texi \
@@ -48,7 +65,9 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
 dist_man_MANS += doc/pspp.1 \
                  doc/psppire.1
 
-EXTRA_DIST += doc/get-commands.pl doc/help-pages-list
+EXTRA_DIST += doc/get-commands.pl \
+              doc/help-pages-list \
+              doc/prepdoc.sh
 
 $(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
 	@$(MKDIR_P)  doc
@@ -59,35 +78,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