X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=af99930f875a08b537498209724de5ec20aced57;hb=d019e8a29d7963a926837d46ae3592c5731f02e3;hp=67c2d83c8fe91d7e4a21ecd6b510fb73c414763c;hpb=14aac9fe7a7efbb6c9bded2ed5969a643cb76645;p=pspp

diff --git a/doc/automake.mk b/doc/automake.mk
index 67c2d83c8f..af99930f87 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 \
@@ -23,6 +22,8 @@ doc_pspp_TEXINFOS = doc/version.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 \
@@ -44,16 +45,33 @@ EXTRA_DIST += doc/pspp.man \
 
 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/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
+doc/tut.texi:
+	@$(MKDIR_P) doc
+	echo "@set example-dir $(examplesdir)" > $@
+
+
+$(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)