Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-repo.patch
changeset 289 3c0dff7ca9c4
parent 280 37650d092283
child 294 5330447b83a3 
--- a/mozilla-repo.patch	Thu Jul 07 08:00:10 2011 +0200
+++ b/mozilla-repo.patch	Fri Jul 08 08:21:23 2011 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 84ecc6172ec5f01c80346bdb819520d08f982bac
+# Parent 1eb30390d6af83e41be9143c5d8c5fedf2ef69ef
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
@@ -19,10 +19,10 @@
  DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
  endif
  
- LIBS += $(JEMALLOC_LIBS)
+ DEFINES += -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \
+            -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)"
  
- ifdef LIBXUL_SDK
- include $(topsrcdir)/config/rules.mk
+ ifdef MOZ_APP_PROFILE
 diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in
 --- a/toolkit/content/Makefile.in
 +++ b/toolkit/content/Makefile.in
@@ -71,7 +71,7 @@
 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
 --- a/toolkit/xre/Makefile.in
 +++ b/toolkit/xre/Makefile.in
-@@ -235,17 +235,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
+@@ -229,17 +229,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
  endif
  endif
mozilla