From cf8e13654be26583755ad9d9c4128c9b6ec925a7 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Fri, 9 May 2008 07:06:35 +0000 Subject: [PATCH] Fix problems with yelp opening info files. --- doc/ChangeLog | 5 +++++ doc/automake.mk | 12 ++++++++++++ po/de.po | 2 +- po/en_GB.po | 2 +- src/ui/gui/ChangeLog | 4 ++++ src/ui/gui/automake.mk | 10 +++++++++- 6 files changed, 32 insertions(+), 3 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index c2547a98..47944660 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2008-05-08 John Darrington + + * automake.mk: Compress the info files, because later + versions of yelp seem to crash otherwise. + 2008-03-11 Jason Stover * regression.texi (REGRESSION): Fixed use of @dots in @math diff --git a/doc/automake.mk b/doc/automake.mk index 9c73d344..84118c19 100644 --- 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 b4532684..c332ac3d 100644 --- 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 \n" "Language-Team: German \n" diff --git a/po/en_GB.po b/po/en_GB.po index b81622db..8786663d 100644 --- 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 \n" "Language-Team: John Darrington \n" diff --git a/src/ui/gui/ChangeLog b/src/ui/gui/ChangeLog index 3a6202cc..25fb4ac5 100644 --- a/src/ui/gui/ChangeLog +++ b/src/ui/gui/ChangeLog @@ -1,3 +1,7 @@ +2008-05-09 John Darrington + + * automake.mk: On make install, warn about the non-existance of yelp. + 2008-05-08 Ben Pfaff Patch #6505. Reviewed by John Darrington. diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index d7a81dc9..c784650c 100644 --- 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 -- 2.30.2