1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 84ecc6172ec5f01c80346bdb819520d08f982bac |
2 # Parent 84ecc6172ec5f01c80346bdb819520d08f982bac |
3 |
3 |
|
4 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
|
5 --- a/browser/app/Makefile.in |
|
6 +++ b/browser/app/Makefile.in |
|
7 @@ -67,17 +67,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc |
|
8 |
|
9 DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID) |
|
10 |
|
11 MOZ_SOURCE_STAMP ?= $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null) |
|
12 ifdef MOZ_SOURCE_STAMP |
|
13 DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)" |
|
14 endif |
|
15 |
|
16 -SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/") |
|
17 +SOURCE_REPO ?= $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/") |
|
18 ifdef SOURCE_REPO |
|
19 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)" |
|
20 endif |
|
21 |
|
22 LIBS += $(JEMALLOC_LIBS) |
|
23 |
|
24 ifdef LIBXUL_SDK |
|
25 include $(topsrcdir)/config/rules.mk |
4 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 |
5 --- a/toolkit/content/Makefile.in |
27 --- a/toolkit/content/Makefile.in |
6 +++ b/toolkit/content/Makefile.in |
28 +++ b/toolkit/content/Makefile.in |
7 @@ -61,17 +61,17 @@ MOZ_SOURCE_STAMP ?= $(shell hg -R $(tops |
29 @@ -61,17 +61,17 @@ MOZ_SOURCE_STAMP ?= $(shell hg -R $(tops |
8 ifdef MOZ_SOURCE_STAMP |
30 ifdef MOZ_SOURCE_STAMP |