summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Tassin <fta@ubuntu.com>2008-10-11 02:50:55 +0200
committerFabien Tassin <fta@ubuntu.com>2008-10-11 02:50:55 +0200
commit1fbf2cf950d736d1bc726745f3ac8e4a833c64f9 (patch)
treec5c6a0fc2e009ccf5f393e2c6ba38f9459de1298
parent7932bff29a3908a0c23eef53c6d87128f78706a5 (diff)
* [ xulapp ] allow caller to specify the xulrunner version
- update src/xulapp.mk.in
-rw-r--r--debian/changelog5
-rw-r--r--src/xulapp.mk.in2
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b5bf494..0d98a31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,11 @@ mozilla-devscripts (0.11) UNRELEASED; urgency=low
add support for xpi not located in the root directory. This is needed
for extensions built with xulapp.mk
- update src/xpi.mk
+ * [ xulapp ]
+ allow caller to specify the xulrunner version
+ - update src/xulapp.mk.in
- -- Fabien Tassin <fta@ubuntu.com> Sat, 27 Sep 2008 19:20:18 +0200
+ -- Fabien Tassin <fta@ubuntu.com> Sat, 11 Oct 2008 02:49:21 +0200
mozilla-devscripts (0.10) intrepid; urgency=low
diff --git a/src/xulapp.mk.in b/src/xulapp.mk.in
index 8709b17..87ad39d 100644
--- a/src/xulapp.mk.in
+++ b/src/xulapp.mk.in
@@ -19,7 +19,7 @@
#####################################################################
-XUL_VERSION := $(shell xulrunner-1.9 --gre-version)
+XUL_VERSION ?= $(shell xulrunner-1.9 --gre-version)
pre-build:: build-system.stamp