1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 80b6464bd883864fce57e8748010869af1be69e9 |
2 # Parent 80b6464bd883864fce57e8748010869af1be69e9 |
3 # Parent 57bb5e3ab77acbff5414d4dbce35a38f21d39276 |
3 # Parent 4799226b419aaf1fcdbbf44c2edb9491d99eb6cb |
4 |
4 |
5 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk |
5 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk |
6 --- a/toolkit/mozapps/installer/package-name.mk |
6 --- a/toolkit/mozapps/installer/package-name.mk |
7 +++ b/toolkit/mozapps/installer/package-name.mk |
7 +++ b/toolkit/mozapps/installer/package-name.mk |
8 @@ -142,24 +142,24 @@ else |
8 @@ -147,24 +147,24 @@ else |
9 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) |
9 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) |
10 endif |
10 endif |
11 |
11 |
12 ifndef INCLUDED_RCS_MK |
12 ifndef INCLUDED_RCS_MK |
13 USE_RCS_MK := 1 |
13 USE_RCS_MK := 1 |
14 include $(MOZILLA_DIR)/config/makefiles/makeutils.mk |
14 include $(MOZILLA_DIR)/config/makefiles/makeutils.mk |
15 endif |
15 endif |
16 |
16 |
17 -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) |
17 -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node}\n" 2>/dev/null)) |
18 +#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) |
18 +#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node}\n" 2>/dev/null)) |
19 |
19 |
20 ########################################################################### |
20 ########################################################################### |
21 # bug: 746277 - preserve existing functionality. |
21 # bug: 746277 - preserve existing functionality. |
22 # MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists |
22 # MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists |
23 ########################################################################### |
23 ########################################################################### |