[Gnash-commit] gnash ./ChangeLog doc/xmldocs.make doc/C/Makefi...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/21 17:20:55

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

Log message:
        * doc/xmldocs.make: Add the hook for installing and uninstalling
        the info file.
        * doc/C/Makefile.am: Install the info file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.217&tr2=1.218&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/xmldocs.make.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.217 gnash/ChangeLog:1.218
--- gnash/ChangeLog:1.217       Thu Apr 20 19:58:31 2006
+++ gnash/ChangeLog     Fri Apr 21 17:20:55 2006
@@ -1,3 +1,9 @@
+2006-04-21  Rob Savoye  <address@hidden>
+
+       * doc/xmldocs.make: Add the hook for installing and uninstalling
+       the info file.
+       * doc/C/Makefile.am: Install the info file.
+
 2006-04-20  Rob Savoye  <address@hidden>
 
        * server/font.cpp: Delete the pointer the proper way.
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.19 gnash/doc/C/Makefile.am:1.20
--- gnash/doc/C/Makefile.am:1.19        Fri Apr  7 00:59:43 2006
+++ gnash/doc/C/Makefile.am     Fri Apr 21 17:20:55 2006
@@ -22,6 +22,7 @@
 
 STYLESDIR = @docbook_styles@
 
+infodir = ${prefix}/share/info
 figdir = images
 docname = gnash
 lang = C
@@ -175,4 +176,10 @@
         gnash.info      \
         gnash.html
 
+install-info-hook: gnash.info
+       $(INSTALL_DATA) gnash.info $(DESTDIR)$(infodir)/
+       install-info --menuentry="Gnash" --description="GNU Flash Player" 
--info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnash.info
+
+uninstall-info-hook:
+       $(RM) $(DESTDIR)$(infodir)/gnash.info
 
Index: gnash/doc/xmldocs.make
diff -u gnash/doc/xmldocs.make:1.5 gnash/doc/xmldocs.make:1.6
--- gnash/doc/xmldocs.make:1.5  Fri Apr  7 00:59:43 2006
+++ gnash/doc/xmldocs.make      Fri Apr 21 17:20:55 2006
@@ -92,6 +92,7 @@
        -for file in $(xml_files); do \
          rm -f $(DESTDIR)$(docdir)/$$file; \
        done
+       -$(RM) -r $(DESTDIR)$(docdir)/images
        -rmdir $(DESTDIR)$(docdir)
 
 if GHELP
@@ -99,3 +100,8 @@
 install-data-hook: omf install-data-hook-omf
 uninstall-hook: uninstall-hook-omf
 endif
+
+if ENABLE_TEXI
+install-data-hook: install-info-hook
+uninstall-hook: uninstall-info-hook
+endif