summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexander Sack <asac@ubuntu.com>2009-07-29 01:45:28 +0200
committerAlexander Sack <asac@ubuntu.com>2009-07-29 01:45:28 +0200
commit0181a0354d7a84fd16918aafd38f771599f72101 (patch)
treee07a19ffd9a78a6e5ce02edd81cdc9d68b406fed /src
parent5e0a08d1e94e4953a3879d65ab447aa166af1271 (diff)
- use moz-version-compare in ${xpi:Depends} |CHECK_VERSION| call
instead of the rather flawed dpkg --compare-versions approach. - update src/xpi.mk
Diffstat (limited to 'src')
-rw-r--r--src/xpi.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xpi.mk b/src/xpi.mk
index d4472d1..b4978a0 100644
--- a/src/xpi.mk
+++ b/src/xpi.mk
@@ -83,7 +83,7 @@ target_versions_prism@developers.mozilla.org := 1.0
TARGET_VERSION = $(shell xpath -q -e '//em:targetApplication/Description[em:id="$(1)" or @em:id="$(1)"]/em:$(2)/text() | //em:targetApplication/Description[em:id="$(1)" or @em:id="$(1)"]/@em:$(2)' $(3)/install.rdf)
# TODO: Use correct comparison
-CHECK_VERSION = $(shell dpkg --compare-versions $(call TARGET_VERSION,$(1),minVersion,$(TEMPDIR)) le $(2) && dpkg --compare-versions $(2) le $(call TARGET_VERSION,$(1),maxVersion,$(TEMPDIR)) && echo $(target_packages_$(1)_$(2)))
+CHECK_VERSION = $(shell moz-version-compare $(call TARGET_VERSION,$(1),minVersion,$(TEMPDIR)) le $(2) && moz-version-compare $(2) le $(call TARGET_VERSION,$(1),maxVersion,$(TEMPDIR)) && echo $(target_packages_$(1)_$(2)))
MOZ_XPI_BUILD_COMMAND ?= med-xpi-pack $(CURDIR) $(MOZ_EXTENSION_PKG).xpi;