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

diff --git a/doc/automake.mk b/doc/automake.mk
index 3445379a..504fb8a7 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -11,6 +11,7 @@ doc_pspp_TEXINFOS = doc/version.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 \
@@ -22,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 \
@@ -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 \
@@ -42,24 +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 > $@
 
-# 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
+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
+
+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) 's/Time-&-Date/Time-\&-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
+CLEANFILES += pspp-dev.dvi $(docbook_DATA)