diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-06-28 16:19:27 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-06-28 16:19:27 -0400 |
| commit | f47536f5706b036aa410636b74e1a96b1d58430a (patch) | |
| tree | 26c4cbe2254af17c16ba9fc38bde7870656db216 /toolkit/mozapps | |
| parent | ee4ef87724fda6c474e7e69b519acd58a574679d (diff) | |
| parent | 7664308ab16560fc25622ef68810300233d39fa9 (diff) | |
| download | UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar.gz UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar.lz UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar.xz UXP-f47536f5706b036aa410636b74e1a96b1d58430a.zip | |
Merge branch 'define-work'
Diffstat (limited to 'toolkit/mozapps')
| -rw-r--r-- | toolkit/mozapps/installer/package-name.mk | 12 |
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 |