summaryrefslogtreecommitdiffstats
path: root/toolkit/mozapps
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-06-28 15:50:23 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-06-28 15:50:23 -0400
commit7664308ab16560fc25622ef68810300233d39fa9 (patch)
treeb26a7dc3a9490a10ada2f544327196ed887b472e /toolkit/mozapps
parentddea4710991d889a1c049835442a15fed026de9e (diff)
downloadUXP-7664308ab16560fc25622ef68810300233d39fa9.tar
UXP-7664308ab16560fc25622ef68810300233d39fa9.tar.gz
UXP-7664308ab16560fc25622ef68810300233d39fa9.tar.lz
UXP-7664308ab16560fc25622ef68810300233d39fa9.tar.xz
UXP-7664308ab16560fc25622ef68810300233d39fa9.zip
Add HYPE_ICEWEASEL where appropriate
Diffstat (limited to 'toolkit/mozapps')
-rw-r--r--toolkit/mozapps/installer/package-name.mk12
1 files changed, 10 insertions, 2 deletions
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
index d88975f36..1a8728088 100644
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -12,10 +12,18 @@ ifndef PACKAGE_NAME_MK_INCLUDED
PACKAGE_NAME_MK_INCLUDED := 1
ifndef MOZ_PKG_VERSION
+# Normally MOZ_PKG_VERSION is set to the application version
+MOZ_PKG_VERSION = $(MOZ_APP_VERSION)
+
+# This overrides it with the BUILDID for Basilisk and IceWeasel
+# We do it this way because makefile's conditional checking is very
+# primitive or else very cryptic
ifdef MC_BASILISK
MOZ_PKG_VERSION = $(BUILDID)
-else
-MOZ_PKG_VERSION = $(MOZ_APP_VERSION)
+endif
+
+ifdef HYPE_ICEWEASEL
+MOZ_PKG_VERSION = $(BUILDID)
endif
endif