[Gnash-commit] gnash doc/C/Makefile.am ./ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/21 23:52:54

Modified files:
        doc/C          : Makefile.am 
        .              : ChangeLog 

Log message:
        * doc/C/Makefile.am: Handle the different options the different
        versions of install-info support.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.219&tr2=1.220&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.219 gnash/ChangeLog:1.220
--- gnash/ChangeLog:1.219       Fri Apr 21 22:55:04 2006
+++ gnash/ChangeLog     Fri Apr 21 23:52:54 2006
@@ -1,5 +1,8 @@
 2006-04-21  Rob Savoye  <address@hidden>
 
+       * doc/C/Makefile.am: Handle the different options the different
+       versions of install-info support.
+       
        * doc/C/Makefile.am: Create the info dir if it doesn't exist.
        * packaging/debian/changelog: Add new entry and up the version.
        * packaging/redhat/gnash.spec: Up the minor version. Install the
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.21 gnash/doc/C/Makefile.am:1.22
--- gnash/doc/C/Makefile.am:1.21        Fri Apr 21 22:55:04 2006
+++ gnash/doc/C/Makefile.am     Fri Apr 21 23:52:53 2006
@@ -179,12 +179,14 @@
 install-info-hook: gnash.info
        test -d "$(DESTDIR)$(infodir)" || $(mkinstalldirs) 
"$(DESTDIR)$(infodir)"
        $(INSTALL_DATA) gnash.info $(DESTDIR)$(infodir)/gnash.info
-       if (install-info --version) >/dev/null 2>&1; then \
-          install-info --menuentry="Gnash" --description="GNU Flash Player" 
--info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info ; \
+       version=`install-info --version | grep -c 'GNU texinfo'`; \
+       if test $$version -eq 0; then \
+          install-info --menuentry="Gnash" --description="GNU Flash Player" 
--info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info >/dev/null 
2>&1; \
+       else \
+          install-info --entry="\* Gnash: (gnash). GNU Flash Player" 
--info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info >/dev/null 
2>&1; \
        fi
 
 
-
 uninstall-info-hook:
        $(RM) $(DESTDIR)$(infodir)/gnash.info