equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 84ecc6172ec5f01c80346bdb819520d08f982bac |
2 # Parent 1eb30390d6af83e41be9143c5d8c5fedf2ef69ef |
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 @@ -67,17 +67,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc |
7 @@ -67,17 +67,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc |
17 +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 |
18 ifdef SOURCE_REPO |
19 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)" |
19 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)" |
20 endif |
20 endif |
21 |
21 |
22 LIBS += $(JEMALLOC_LIBS) |
22 DEFINES += -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \ |
|
23 -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" |
23 |
24 |
24 ifdef LIBXUL_SDK |
25 ifdef MOZ_APP_PROFILE |
25 include $(topsrcdir)/config/rules.mk |
|
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 @@ -61,17 +61,17 @@ MOZ_SOURCE_STAMP ?= $(shell hg -R $(tops |
30 ifdef MOZ_SOURCE_STAMP |
30 ifdef MOZ_SOURCE_STAMP |
69 |
69 |
70 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt |
70 MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt |
71 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
71 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
72 --- a/toolkit/xre/Makefile.in |
72 --- a/toolkit/xre/Makefile.in |
73 +++ b/toolkit/xre/Makefile.in |
73 +++ b/toolkit/xre/Makefile.in |
74 @@ -235,17 +235,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR |
74 @@ -229,17 +229,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR |
75 endif |
75 endif |
76 endif |
76 endif |
77 |
77 |
78 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
78 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) |
79 # strip a trailing slash from the repo URL because it's not always present, |
79 # strip a trailing slash from the repo URL because it's not always present, |