diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /toolkit/mozapps/installer/package-name.mk | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'toolkit/mozapps/installer/package-name.mk')
| -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 |