Fix problems with yelp opening info files.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index c2547a9818fa00232d07df3b84e246d6258abbde..47944660818ea11d21c0141a2f4a5eda28a3f56c 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-08 John Darrington <john@darrington.wattle.id.au>
+
+       * automake.mk: Compress the info files, because later
+       versions of yelp seem to crash otherwise.
+
 2008-03-11  Jason Stover  <jhs@math.gcsu.edu>
 
        * regression.texi (REGRESSION): Fixed use of @dots in @math

diff --git a/doc/automake.mk b/doc/automake.mk
index 9c73d344bffbeef2489fd3eb4ea166e3c6fd4ecb..84118c198a3b1b2e118c98acab38ec5a8e923117 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -43,3 +43,15 @@ 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 > $@
+
+# 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::
+       for ifile in $(DESTDIR)$(infodir)/pspp.info-[0-9] \
+               $(DESTDIR)$(infodir)/pspp.info  ; do \
+         gzip -f $$ifile ; \
+       done
+
+uninstall-hook::
+       rm -f $(DESTDIR)$(infodir)/pspp.info-[0-9].gz
+       rm -f $(DESTDIR)$(infodir)/pspp.info.gz

diff --git a/po/de.po b/po/de.po
index b4532684a71b61e5989a260320aada30aa2560db..c332ac3dacf7e9f349cbf9ad439a24fdcb5e1f69 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2008-05-09 13:35+0800\n"
+"POT-Creation-Date: 2008-05-09 11:48+0800\n"
 "PO-Revision-Date: 2006-07-28 19:32+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: German <pspp-dev@gnu.org>\n"

diff --git a/po/en_GB.po b/po/en_GB.po
index b81622db92f9a34493b1f9fdf5f41f98821d589b..8786663dbd5690919906e08efeb05454e9d1a562 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2008-05-09 13:35+0800\n"
+"POT-Creation-Date: 2008-05-09 11:48+0800\n"
 "PO-Revision-Date: 2007-09-15 08:29+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"

diff --git a/src/ui/gui/ChangeLog b/src/ui/gui/ChangeLog
index 3a6202cc134e0eeca631e028e03b705730364a6e..25fb4ac52dad1824b0b53e9f5b99850d657f1bee 100644 (file)
--- a/src/ui/gui/ChangeLog
+++ b/src/ui/gui/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-09  John Darrington <john@darrington.wattle.id.au>
+
+       * automake.mk: On make install, warn about the non-existance of yelp.
+
 2008-05-08  Ben Pfaff  <blp@gnu.org>
 
        Patch #6505.  Reviewed by John Darrington.

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index d7a81dc9b378a7b6d9c6c926bb0b935f2553e84b..c784650cce3628ac67670339aff4737a0696d2c3 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -195,4 +195,12 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/window-manager.c \
        src/ui/gui/window-manager.h
 
-
+install-data-hook::
+       @if ! yelp --version > /dev/null 2>&1 ; then \
+               echo    ; \
+               echo '    The Yelp document viewer does not seem to be installed on the system.' ; \
+               echo '    If Yelp is not available at run time, then the PSPPIRE online reference' ; \
+               echo '    manual will not be available.' ; \
+               echo '    Yelp is available from the GNOME project.  ftp://ftp.gnome.org/pub/gnome/sources/yelp' ; \
+               echo ; \
+       fi