X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=d3c91a26417e712e00c5522f62113212e82d929d;hb=42004e91dc5a76f746b9bf902130182318806291;hp=9402d7af0aea98ab731007f7b905f251973c13f3;hpb=a645efe8a26ace14b0c417a57559381d4c7193f5;p=pspp-builds.git

diff --git a/doc/automake.mk b/doc/automake.mk
index 9402d7af..d3c91a26 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 \
@@ -44,23 +43,35 @@ 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 > $@
 
-doc/tut.texi:
+$(srcdir)/doc/tut.texi:
 	@$(MKDIR_P) doc
 	echo "@set example-dir $(examplesdir)" > $@
 
 
-doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
+$(srcdir)/doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
 	@$(MKDIR_P)  doc
-	$(MAKEINFO) --docbook -I $(top_srcdir) $< -o $@
-	$(SED) -i -e '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/&copy;/\&#0169;/g' \
+		-e 's/&minus;/\&#8722;/g' \
+		-e 's/&hellip;/\&#8230;/g' \
+		-e 's/&period;/./g' \
+		> $@
+	$(XMLLINT) --output /dev/null $@ 2>&1 2> /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)