summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasa Bodiroza <jazzva@gmail.com>2009-01-16 01:10:38 +0100
committerSasa Bodiroza <jazzva@gmail.com>2009-01-16 01:10:38 +0100
commit728f0d60d6d5452d178f6a5ad06aa2d4a869f05a (patch)
tree4a05b20e0867be5f2c11de5a86f1eb0f86f82202
parent173e65eae2b7fdd1dba2080f65c6265df4bb507b (diff)
Remove firefox from MOZ_XPI_MOZILLA_DIRS in src/xpi.mk, adjust parameter description
-rw-r--r--debian/changelog5
-rw-r--r--src/xpi.mk9
2 files changed, 8 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index d310adf..1fe8890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
mozilla-devscripts (0.12) UNRELEASED; urgency=low
+ * Remove "firefox" from MOZ_XPI_MOZILLA_DIRS in src/xpi.mk, adjust parameter
+ description
+ [ Fabien Tassin ]
* [ mozclient ]
- fix hg incorrectly requesting branches
- update src/mozclient/lib/MozClient/Mercurial.pm
@@ -7,7 +10,7 @@ mozilla-devscripts (0.12) UNRELEASED; urgency=low
path if we are building with a conf-dir and no script was found
- update src/mozclient/lib/MozClient/VCS.pm
- -- Fabien Tassin <fta@ubuntu.com> Wed, 26 Nov 2008 15:43:32 +0100
+ -- Sasa Bodiroza <jazzva@gmail.com> Fri, 16 Jan 2009 01:08:52 +0100
mozilla-devscripts (0.11) jaunty; urgency=low
diff --git a/src/xpi.mk b/src/xpi.mk
index 87a2b3a..d1923c9 100644
--- a/src/xpi.mk
+++ b/src/xpi.mk
@@ -42,15 +42,14 @@
# 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):
+# MOZ_XPI_MOZILLA_DIRS (DEFAULT=firefox-addons):
# defines in which directories to create links for this extension.
-# the default is "firefox-addons" and "firefox", which means that
+# the default is "firefox-addons", which means that
# the extension will be linked appropriately to the
-# /usr/lib/firefox-addons/extensions and the /usr/lib/firefox/extensions
-# directories.
+# /usr/lib/firefox-addons/extensions directory.
#
-MOZ_XPI_MOZILLA_DIRS ?= firefox-addons firefox
+MOZ_XPI_MOZILLA_DIRS ?= firefox-addons
MOZ_XPI_BUILD_COMMAND ?= med-xpi-pack $(CURDIR) $(MOZ_EXTENSION_PKG).xpi;