From f14479240ea7cc5ab9cd73016475d9c6466f283d Mon Sep 17 00:00:00 2001 From: Rail Aliiev Date: Thu, 8 Mar 2012 14:57:23 -0500 Subject: [PATCH] Bug 731795 - MOZ_SOURCESTAMP_FILE shouldn't depend on MOZ_PKG_PRETTYNAMES. r=khuey --- toolkit/mozapps/installer/package-name.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk index 2d13d9bbc4ab..416ccd741dcc 100644 --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -94,6 +94,7 @@ PKG_INST_BASENAME = $(PKG_BASENAME).installer PKG_INST_PATH = install/sea/ PKG_UPDATE_BASENAME = $(PKG_BASENAME) CHECKSUMS_FILE_BASENAME = $(PKG_BASENAME) +MOZ_SOURCESTAMP_FILE_BASENAME = $(PKG_BASENAME) PKG_UPDATE_PATH = update/ COMPLETE_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).complete.mar # PARTIAL_MAR needs to be processed by $(wildcard) before you use it. @@ -137,6 +138,7 @@ CHECKSUMS_FILE_BASENAME = $(PKG_BASENAME) endif PKG_INST_PATH = $(PKG_PATH) PKG_UPDATE_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION) +MOZ_SOURCESTAMP_FILE_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION) PKG_UPDATE_PATH = update/$(PKG_PATH) COMPLETE_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).complete.mar # PARTIAL_MAR needs to be processed by $(wildcard) before you use it. @@ -170,7 +172,7 @@ MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{ _dollar=$$ MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) -MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt +MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt # JavaScript Shell PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip -- 2.11.4.GIT