Merge branch 'master'; commit 'origin/stable'

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

diff --git a/doc/automake.mk b/doc/automake.mk
index 3445379a1ca756e00e62751623ab4759cdf12dc0..f6f669b1ef42c80be37da834b3ff0bdec833f6ac 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 \
@@ -44,22 +46,19 @@ 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 > $@
 
-# 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 \
+
+install-info-file:
+       for ifile in $(DESTDIR)$(infodir)/pspp.info-[0-9] $(DESTDIR)$(infodir)/pspp.info  ; do \
          gzip -f $$ifile ; \
-       done
+       done 
+
+INSTALL_DATA_HOOKS += install-info-file
+
+uninstall-info-file:
+       $(RM) $(DESTDIR)$(infodir)/pspp.info-[0-9].gz ; \
+       $(RM) $(DESTDIR)$(infodir)/pspp.info.gz ;
 
-uninstall-hook::
-       rm -f $(DESTDIR)$(infodir)/pspp.info-[0-9].gz
-       rm -f $(DESTDIR)$(infodir)/pspp.info.gz
+UNINSTALL_DATA_HOOKS += uninstall-info-file
 
 EXTRA_DIST += doc/OChangeLog
 CLEANFILES += pspp-dev.dvi