[Gnash-commit] gnash ChangeLog plugin/Makefile.am

[Dossy Shiobara]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Dossy Shiobara <dossy>  08/04/27 01:48:13

Modified files:
        .              : ChangeLog 
        plugin         : Makefile.am 

Log message:
        install-plugin rule should do nothing on Win32 in top-level
        plugin dir, but instead recurse down to the plugin/win32 dir.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6409&r2=1.6410
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.75&r2=1.76

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6409
retrieving revision 1.6410
diff -u -b -r1.6409 -r1.6410
--- ChangeLog   26 Apr 2008 19:08:40 -0000      1.6409
+++ ChangeLog   27 Apr 2008 01:48:12 -0000      1.6410
@@ -1,3 +1,9 @@
+2008-04-26  Dossy Shiobara <address@hidden>
+
+       * plugin/Makefile.am: install-plugin rule should do
+         nothing on Win32 in top-level plugin dir, but instead
+         recurse down to the plugin/win32 dir.
+
 2008-04-26 Robert Millan <address@hidden>
 
     * gui/gtk.cpp: make the preferences menu buttons more

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- plugin/Makefile.am  26 Apr 2008 07:58:17 -0000      1.75
+++ plugin/Makefile.am  27 Apr 2008 01:48:13 -0000      1.76
@@ -122,6 +122,7 @@
        @echo "Nothing to install here now."
        @echo "Use \"make install-plugin\" to install the Firefox plugin to 
$(DESTDIR)$(plugindir)."
 
+if !WIN32
 install-plugin: $(plugin_LTLIBRARIES)
        @test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs) 
"$(DESTDIR)$(plugindir)"
        @echo "Installing plugin to $(DESTDIR)$(plugindir)"
@@ -130,9 +131,14 @@
        else \
          cp -f libgnashplugin.so* $(DESTDIR)$(plugindir)/libgnashplugin.so; \
        fi
+else
+install-plugin: 
+       : # do nothing
+endif # WIN32
 
 install-plugins: install-plugin
        $(MAKE) -C klash install-plugins
+       $(MAKE) -C win32 install-plugins
 
 uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
        $(RM) -f $(DESTDIR)$(plugindir)/libgnashplugin.so