X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=504fb8a7bd7522ef1a74335d5392f60087f5c387;hb=1b49116188b31ff17ee1a85e944488a7f254b847;hp=67c2d83c8fe91d7e4a21ecd6b510fb73c414763c;hpb=9e0e4996fad6563f0a1ce628b80db5c23ef8279e;p=pspp-builds.git

diff --git a/doc/automake.mk b/doc/automake.mk
index 67c2d83c..504fb8a7 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -23,6 +23,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 +46,23 @@ 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/tut.texi:
+	@$(MKDIR_P) doc
+	echo "@set example-dir $(examplesdir)" > $@
+
 
 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) 's/Time-&-Date/Time-\&amp;-Date/g' > $@
+	$(XMLLINT) --output /dev/null $@ 2>&1 2> /dev/null || ( $(RM) $@ && false )
 
 docbookdir = $(docdir)
 docbook_DATA = doc/pspp.xml
-
+EXTRA_DIST += doc/pspp.xml
 
 EXTRA_DIST += doc/OChangeLog
 CLEANFILES += pspp-dev.dvi $(docbook_DATA)