diff options
author | Alexander Sack <asac@jwsdot.com> | 2008-02-21 13:47:12 +0000 |
---|---|---|
committer | Alexander Sack <asac@jwsdot.com> | 2008-02-21 13:47:12 +0000 |
commit | 911eecd0be04555df9bb53783a99a3609a838b58 (patch) | |
tree | 6380c5456f48144560539714ace9e0688232c2e1 /src | |
parent | b50e957d859c93fdda2731c03e934c30633c6889 (diff) |
* revert ~mt release accidentially committed (now again 0.5 + UNRELEASED)
* introduce MOZ_XPI_MOZILLA_DIRS in xpi.mk with default values: "firefox-addons
firefox"
- update src/xpi.mk
* cleanup some stamp- business
- update src/xpi.mk
* document in changelog
- update debian/changelog
Diffstat (limited to 'src')
-rw-r--r-- | src/xpi.mk | 25 |
1 files changed, 19 insertions, 6 deletions
@@ -41,8 +41,16 @@ # should produce an .xpi in top level directory. Note: If this # command is specified, all .xpi files in the top level directory # will be removed during |clean| +# MOZ_XPI_MOZILLA_DIRS (DEFAULT=firefox-addons firefox): +# defines in which directories to create links for this extension. +# the default is "firefox-addons" and "firefox", which means that +# the extension will be linked appropriately to the +# /usr/lib/firefox-addons/extensions and the /usr/lib/firefox/extensions +# directories. # +MOZ_XPI_MOZILLA_DIRS ?= firefox-addons firefox + TEMPDIR := $(shell rm -rf temp-xpi-*; mktemp -d temp-xpi-XXXXXXXX) ifneq (,$(MOZ_XPI_FILE)) @@ -77,14 +85,20 @@ stamp-unzip-%: unzip -d $(TEMPDIR) $* touch $@ -stamp-install-%: - dh_installdirs -p$(MOZ_EXTENSION_PKG) /usr/lib/firefox-addons/extensions +stamp-installdirs-%: + dh_installdirs -p$(MOZ_EXTENSION_PKG) /usr/lib/$*/extensions + touch $@ + +stamp-installlinks-%: + dh_link -p$(MOZ_EXTENSION_PKG) /usr/share/$(MOZ_EXTENSION_PKG) /usr/lib/$*/extensions/$(call XPI_EMID,$(TEMPDIR)) + touch $@ + +stamp-install-%: $(foreach mozilla,$(MOZ_XPI_MOZILLA_DIRS),stamp-installdirs-$(mozilla) stamp-installlinks-$(mozilla)) dh_install -p$(MOZ_EXTENSION_PKG) $(wildcard $(TEMPDIR)/*) /usr/share/$(MOZ_EXTENSION_PKG) - dh_link -p$(MOZ_EXTENSION_PKG) /usr/share/$(MOZ_EXTENSION_PKG) /usr/lib/firefox-addons/extensions/$(call XPI_EMID,$(TEMPDIR)) touch $@ stamp-extension-install: $(XPI_FILE) stamp-unzip-$(XPI_FILE) stamp-install-$(XPI_FILE) - touch stamp-extension-install + touch $@ # only attempt to do things if a pkg was provided; otherwise error out @@ -94,8 +108,7 @@ xpi-install: stamp-extension-install xpi-clean: dh_clean -p$(MOZ_EXTENSION_PKG) -rm -f stamp-extension-install \ - unzip-* \ - install-* \ + stamp-* \ $(NULL) -rm -rf $(TEMPDIR) |