equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 732243388ea9cc592d30e1951f29a94a0ce5a035 |
2 # Parent 07dc7ea11c92368cb7c137a403feaaa6861abb3c |
3 |
3 |
4 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
4 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
5 --- a/browser/app/Makefile.in |
5 --- a/browser/app/Makefile.in |
6 +++ b/browser/app/Makefile.in |
6 +++ b/browser/app/Makefile.in |
7 @@ -68,17 +68,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc |
7 @@ -68,17 +68,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc |
24 |
24 |
25 ifdef MOZ_APP_PROFILE |
25 ifdef MOZ_APP_PROFILE |
26 diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in |
26 diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in |
27 --- a/toolkit/content/Makefile.in |
27 --- a/toolkit/content/Makefile.in |
28 +++ b/toolkit/content/Makefile.in |
28 +++ b/toolkit/content/Makefile.in |
29 @@ -61,17 +61,17 @@ MOZ_SOURCE_STAMP ?= $(shell hg -R $(tops |
29 @@ -65,17 +65,17 @@ endif |
30 ifdef MOZ_SOURCE_STAMP |
30 ifeq (Android,$(OS_TARGET)) |
31 DEFINES += -DSOURCE_CHANGESET="$(MOZ_SOURCE_STAMP)" |
31 DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) |
32 endif |
32 endif |
33 |
33 |
34 # strip a trailing slash from the repo URL because it's not always present, |
34 # strip a trailing slash from the repo URL because it's not always present, |
35 # and we want to construct a working URL in buildconfig.html |
35 # and we want to construct a working URL in buildconfig.html |
36 # make+shell+sed = awful |
36 # make+shell+sed = awful |
72 # JavaScript Shell |
72 # JavaScript Shell |
73 PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
73 PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip |
74 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
74 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
75 --- a/toolkit/xre/Makefile.in |
75 --- a/toolkit/xre/Makefile.in |
76 +++ b/toolkit/xre/Makefile.in |
76 +++ b/toolkit/xre/Makefile.in |
77 @@ -231,17 +231,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR |
77 @@ -227,17 +227,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR |
78 endif |
78 endif |
79 endif |
79 endif |
80 |
80 |
81 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
81 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
82 # strip a trailing slash from the repo URL because it's not always present, |
82 # strip a trailing slash from the repo URL because it's not always present, |