[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10796: actually install the xpcom s
From: |
rob |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10796: actually install the xpcom support when enabled. |
Date: |
Wed, 15 Apr 2009 21:02:46 -0600 |
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 10796
committer: address@hidden
branch nick: trunk
timestamp: Wed 2009-04-15 21:02:46 -0600
message:
actually install the xpcom support when enabled.
modified:
packaging/snapshot.am
packaging/xpi.am
plugin/Makefile.am
plugin/xpcom/Makefile.am
=== modified file 'packaging/snapshot.am'
--- a/packaging/snapshot.am 2009-04-16 00:11:19 +0000
+++ b/packaging/snapshot.am 2009-04-16 03:02:46 +0000
@@ -30,7 +30,7 @@
# this is the name of the actual tarball
SNAPSHOT_TAR = gnash-$(BRANCH_REVNO)_$(BRANCH_NICK).tar.gz
# this is the temporary directory used for DESTDIR
-SNAPSHOT_TMP = /tmp/$(SNAPSHOT_DIR)_$(BRANCH_NICK)
+SNAPSHOT_TMP = /tmp/$(SNAPSHOT_DIR)
# extract info from bazar
=== modified file 'packaging/xpi.am'
--- a/packaging/xpi.am 2009-04-14 18:44:05 +0000
+++ b/packaging/xpi.am 2009-04-16 03:02:46 +0000
@@ -72,7 +72,7 @@
# have to reconfigure to enable shared libraries to be built, and then rebuild
# the plugins and the xpcom support as dynamically loadable modules.
xpi-bundle:
- snapshot_dest="/tmp/$(SNAPSHOT_NAME)-tmp"; \
+ snapshot_dest="/tmp/$(SNAPSHOT_NAME)"; \
snapshot_xpi="/tmp/$(SNAPSHOT_NAME)-tmp"; \
mkdir -p $${snapshot_xpi}/plugins; \
for i in install.rdf; do \
=== modified file 'plugin/Makefile.am'
--- a/plugin/Makefile.am 2009-02-25 22:33:03 +0000
+++ b/plugin/Makefile.am 2009-04-16 03:02:46 +0000
@@ -123,6 +123,11 @@
endif # NPAPI
endif # WIN32
+if XPCOM
+ PKGLIB = install-pkglib
+else
+ PKGLIB =
+endif
test_perms:
@if test ! -w $(DESTDIR)$(plugindir); then \
echo "WARNING: Improper permissions for $(DESTDIR)$(plugindir)!"; \
@@ -137,7 +142,7 @@
if !WIN32
if NPAPI
-install-plugin: $(plugin_LTLIBRARIES)
+install-plugin: $(plugin_LTLIBRARIES) $(PKGLIB) install-plugins
@test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs)
"$(DESTDIR)$(plugindir)"
@echo "Installing plugin to $(DESTDIR)$(plugindir)"
@if test -d .libs; then \
@@ -154,7 +159,7 @@
: # do nothing
endif # WIN32
-install-plugins: install-plugin
+install-plugins: install-plugin $(PKGLIB)
$(MAKE) -C klash install-plugins
$(MAKE) -C klash4 install-plugins
$(MAKE) -C win32 install-plugins
=== modified file 'plugin/xpcom/Makefile.am'
--- a/plugin/xpcom/Makefile.am 2009-02-25 22:33:03 +0000
+++ b/plugin/xpcom/Makefile.am 2009-04-16 03:02:46 +0000
@@ -61,8 +61,8 @@
EXT_DIR = "`dirname
$(FIREFOX_PLUGINS)/extensions/{2b70f2b1-fc72-4734-bb81-4eb2a7713e49}`"
-install-pkglib: $(pkglib_LTLIBRARIES)
- @test -d "$(DESTDIR)/$(EXT_DIR)" || $(mkinstalldirs)
"$(DESTDIR)/$(EXT_DIR)"
+install-plugin install-pkglib: $(pkglib_LTLIBRARIES)
+ @test -d "$(DESTDIR)$(EXT_DIR)" || $(mkinstalldirs)
"$(DESTDIR)$(EXT_DIR)"
@if test -d .libs; then \
cp -f .libs/libgnashcomponent.so*
$(DESTDIR)$(EXT_DIR)/libgnashcomponent.so; \
cp -f iGnashComponent.xpt $(DESTDIR)$(EXT_DIR)/iGnashComponent.xpt; \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10796: actually install the xpcom support when enabled.,
rob <=