[Gnash-commit] /srv/bzr/gnash/trunk r9688: Fixed a couple of problems that prevented 'make xpi' from working.

[Russell Nelson]

------------------------------------------------------------
revno: 9688
committer: Russell Nelson <address@hidden>
branch nick: trunk
timestamp: Sat 2008-09-06 14:59:09 -0400
message:
  Fixed a couple of problems that prevented 'make xpi' from working.
modified:
  packaging/xpi.am
  plugin/xpcom/Makefile.am

=== modified file 'packaging/xpi.am'
--- a/packaging/xpi.am  2008-08-12 16:01:42 +0000
+++ b/packaging/xpi.am  2008-09-06 18:59:09 +0000
@@ -43,24 +43,28 @@
 
 xpi-configure: xpi-unpack $(XPI_BUILD)
        address@hidden -f ipkg-configure
-       cd $(XPI_BUILD); ./configure $(CONFIG_OPTS) --disable-shared 
--enable-static
+       cd $(XPI_BUILD); ./configure $(CONFIG_OPTS) --disable-shared 
--enable-static --enable-xpcom
        @touch xpi-configure
 
-xpi-build: #xpi-configure
+xpi-build: xpi-configure
        address@hidden -f xpi-build
        $(MAKE) -C $(XPI_BUILD) all
        $(MAKE) -C $(XPI_BUILD) install DESTDIR=$(XPI_TMP)
        @touch xpi-build
 
 xpi-plugin: 
-       cd $(XPI_BUILD); ./configure $(CONFIG_OPTS) --disable-static 
--enable-shared
+       address@hidden -f xpi-plugin
+       cd $(XPI_BUILD); ./configure $(CONFIG_OPTS) --disable-static 
--enable-shared --enable-xpcom
        $(MAKE) -C $(XPI_BUILD)/plugin clean all GNASHBINDIR=
        $(MAKE) -C $(XPI_BUILD) install-plugin DESTDIR=$(XPI_TMP)
        $(MAKE) -C $(XPI_BUILD)/plugin/xpcom install-pkglib DESTDIR=$(XPI_TMP)
+       address@hidden xpi-plugin
 
-xpi xpi-bundle: #xpi-build xpi-plugin
+xpi xpi-bundle: xpi-build xpi-plugin
        if ! test -d $(XPI_BUNDLE)/ ; then \
          mkdir $(XPI_BUNDLE); \
+        else \
+          rm -rf $(XPI_BUNDLE)/*; \
        fi
        topdir=`cd ${top_srcdir}; pwd`; \
        for i in install.rdf; do \
@@ -69,9 +73,10 @@
        cp -fr $(XPI_TMP)$(bindir)/*gnash $(XPI_BUNDLE)/
        cp -fr $(XPI_TMP)$(localedir) $(XPI_BUNDLE)/
        cp -fr $(XPI_TMP)/tmp/plugin/libgnashplugin.so $(XPI_BUNDLE)/
-       cp -fr $(XPI_TMP)/tmp/extensions/*/*.xpt $(XPI_BUNDLE)/
-       cp -fr $(XPI_TMP)/tmp/extensions/*/*.so $(XPI_BUNDLE)/
+       cp -fr $(XPI_TMP)/tmp/plugin/extensions/*.xpt $(XPI_BUNDLE)/
+       cp -fr $(XPI_TMP)/tmp/plugin/extensions/*.so $(XPI_BUNDLE)/
        (cd $(XPI_BUNDLE) ; $(ZIP) -r /tmp/gnash.xpi *)
+       echo "The bundle is /tmp/gnash.xpi"
 
 xpi-clean:
        rm -fr xpi-* $(XPI_BUILD) $(XPI_TMP) gnash-$(VERSION)*.xpi

=== modified file 'plugin/xpcom/Makefile.am'
--- a/plugin/xpcom/Makefile.am  2008-09-05 16:18:03 +0000
+++ b/plugin/xpcom/Makefile.am  2008-09-06 18:59:09 +0000
@@ -59,7 +59,7 @@
 .idl.xpt:
        $(XPIDL) -m typelib -v $(XPCOM_IDL_CFLAGS) $<
 
-EXT_DIR = "`dirname 
$(FIREFOX_PLUGINS))/extensions/{2b70f2b1-fc72-4734-bb81-4eb2a7713e49}`"
+EXT_DIR = "`dirname 
$(FIREFOX_PLUGINS)/extensions/{2b70f2b1-fc72-4734-bb81-4eb2a7713e49}`"
 
 install-pkglib: $(pkglib_LTLIBRARIES)
        @test -d "$(DESTDIR)/$(EXT_DIR)" || $(mkinstalldirs) 
"$(DESTDIR)/$(EXT_DIR)"