From 911eecd0be04555df9bb53783a99a3609a838b58 Mon Sep 17 00:00:00 2001
From: Alexander Sack <asac@jwsdot.com>
Date: Thu, 21 Feb 2008 13:47:12 +0000
Subject: * 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

---
 src/xpi.mk | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/xpi.mk b/src/xpi.mk
index 595d0d8..8f2a5ac 100644
--- a/src/xpi.mk
+++ b/src/xpi.mk
@@ -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)
 
-- 
cgit v1.2.3