Re: pre3 changes

[John Darrington]

On Tue, May 13, 2008 at 10:12:54AM -0700, Ben Pfaff wrote:
     
     Second, automake didn't like having two install-data-hook
     targets:
     
I noticed that automake gave a warning (which I think is an automake
bug) but I saw nothing when running  ./confugure or Makefile


     ----------------------------------------------------------------------
     Index: doc/automake.mk
     ===================================================================
     RCS file: /cvsroot/pspp/pspp/doc/automake.mk,v
     retrieving revision 1.7
     diff -u -p -r1.7 automake.mk
     --- doc/automake.mk        9 May 2008 07:06:36 -0000       1.7
     +++ doc/automake.mk        13 May 2008 16:42:57 -0000
     @@ -46,7 +46,12 @@ doc/ni.texi: $(top_srcdir)/src/language/
      
      # 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 ; \
     Index: src/ui/gui/automake.mk
     ===================================================================
     RCS file: /cvsroot/pspp/pspp/src/ui/gui/automake.mk,v
     retrieving revision 1.54
     diff -u -p -r1.54 automake.mk
     --- src/ui/gui/automake.mk 9 May 2008 07:06:37 -0000       1.54
     +++ src/ui/gui/automake.mk 13 May 2008 16:43:06 -0000
     @@ -195,7 +195,7 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/window-manager.c \
        src/ui/gui/window-manager.h
      
     -install-data-hook::
     +yelp-check::
        @if ! yelp --version > /dev/null 2>&1 ; then \
                echo    ; \
                echo '    The Yelp document viewer does not seem to be 
installed on the system.' ; \
     ----------------------------------------------------------------------
     
     I haven't checked these in yet.  Comments?

If we're going to do it this way, then :: ought to be replaced by :
Also, yelp-check should be declared .PHONEY





-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://pgp.mit.edu or any PGP keyserver for public key.

signature.asc
Description: Digital signature