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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/03/02 19:27:08

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

Log message:
                * doc/C/Makefile.am: Fix install rule to deal with multiple
                versions of install-info.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/Makefile.am?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5775&r2=1.5776

Patches:
Index: doc/C/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- doc/C/Makefile.am   2 Mar 2008 17:49:18 -0000       1.60
+++ doc/C/Makefile.am   2 Mar 2008 19:27:07 -0000       1.61
@@ -264,13 +264,22 @@
          $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir)/images/$$basefile; \
        done
 
+# There are two versions of install-info, with unfortunately different options.
+# Rather than test the version at configure time, we do it at runtime instead
+# so we can switch versions at installation time.
 install-info-hook: 
 if ENABLE_INFO
        @test -d "$(DESTDIR)$(infodir)" || $(mkinstalldirs) 
"$(DESTDIR)$(infodir)"
        $(INSTALL_DATA) gnash_user.info $(DESTDIR)$(infodir)/gnash_user.info 
-       $(INSTALL_INFO) --menuentry="Gnash User Manual" --quiet 
--description="Gnash User Manual" --info-dir=$(DESTDIR)$(infodir) 
$(DESTDIR)$(infodir)/gnash_user.info
        $(INSTALL_DATA) gnash_ref.info $(DESTDIR)$(infodir)/gnash_ref.info 
-       $(INSTALL_INFO) --menuentry="Gnash Reference Manual" --quiet 
--description="Gnash Reference Manual" --info-dir=$(DESTDIR)$(infodir) 
$(DESTDIR)$(infodir)/gnash_ref.info
+       type="`file $(INSTALL_INFO) | grep -ic " perl " 2>&1`"; \
+       if test $${type} -gt 0; then \
+         $(INSTALL_INFO) --menuentry="\"Gnash User Manual\"" --quiet 
--description="\"Gnash User Manual\"" --info-dir=$(DESTDIR)$(infodir) 
$(DESTDIR)$(infodir)/gnash_user.info; \
+         $(INSTALL_INFO) --menuentry="\"Gnash Reference Manual\"" --quiet 
--description="\"Gnash Reference Manual\"" --info-dir=$(DESTDIR)$(infodir) 
$(DESTDIR)$(infodir)/gnash_ref.info; \
+        else \
+         $(INSTALL_INFO) --entry="\"Gnash User Manual: (gnash_user)    Gnash 
User Manual\"" --info-dir=$(DESTDIR)$(infodir) 
$(DESTDIR)$(infodir)/gnash_user.info; \
+         $(INSTALL_INFO) --entry="\"Gnash Reference Manual (gnash_ref) Gnash 
Reference Manual\"" --info-dir=$(DESTDIR)$(infodir) 
$(DESTDIR)$(infodir)/gnash_ref.info; \
+       fi
 else
        echo "Using preformtted output file,"
        $(LN_S) -f $(srcdir)/preformatted/gnash_user.info.in gnash_user.info

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5775
retrieving revision 1.5776
diff -u -b -r1.5775 -r1.5776
--- ChangeLog   2 Mar 2008 17:49:17 -0000       1.5775
+++ ChangeLog   2 Mar 2008 19:27:07 -0000       1.5776
@@ -1,8 +1,11 @@
 2008-03-02  Rob Savoye  <address@hidden>
 
+       * doc/C/preformatted: Update.
        * doc/C/Makefile.am: Furthur tweaking of the .xml.texi rule so it
        works with versions to correctly produce both info files. On
-       Fedora, it kept only creating gnash_user.info
+       Fedora, it kept only creating gnash_user.info. Fix install rule to
+       deal with multiple versions of install-info.
+
        * doc/C/refmanual/internals.xml: Use <emphasis> instead of <code>,
        as <code> doesn't appear to be supported on Fedora.
        * doc/C/refmanual/extensions/extensions.xml: Use <emphasis>