Merge commit 'origin/stable'

[pspp-builds.git] / doc / automake.mk

diff --git a/doc/automake.mk b/doc/automake.mk
index 84118c198a3b1b2e118c98acab38ec5a8e923117..c25e0cb3cb610b0657223abf2e85467ce3807770 100644 (file)
--- 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 \
@@ -32,6 +33,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 \
@@ -46,7 +48,12 @@ doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
 
 # 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.
-install-data-hook::
+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 ; \
@@ -55,3 +62,6 @@ install-data-hook::
 uninstall-hook::
        rm -f $(DESTDIR)$(infodir)/pspp.info-[0-9].gz
        rm -f $(DESTDIR)$(infodir)/pspp.info.gz
+
+EXTRA_DIST += doc/OChangeLog
+CLEANFILES += pspp-dev.dvi