From 84a67b7a61e0a1915fec44930da33f6d3928015c Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 5 Sep 2012 20:43:23 +0200 Subject: [PATCH] Bug 787180 - Switch between FINAL_TARGET and DIST/bin in various places under browser/. r=khuey --- browser/app/Makefile.in | 18 +++++++++--------- browser/app/profile/extensions/Makefile.in | 2 +- .../Makefile.in | 5 +---- browser/extensions/Makefile.in | 10 +++++----- browser/locales/Makefile.in | 6 ++++-- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 5f891caa359..e5d01f6f3e1 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -126,7 +126,7 @@ ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) libs:: cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX) -GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js) +GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, firefox.js) endif @@ -134,24 +134,24 @@ endif #} LIBXUL_SDK ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) libs:: - $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons - $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default - $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default - $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default endif libs:: $(srcdir)/profile/prefs.js - $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile + $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile ifndef LIBXUL_SDK # channel-prefs.js is handled separate from other prefs due to bug 756325 libs:: $(srcdir)/profile/channel-prefs.js - $(NSINSTALL) -D $(DIST)/bin/defaults/pref - $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(ACDEFINES) $^ > $(DIST)/bin/defaults/pref/channel-prefs.js + $(NSINSTALL) -D $(FINAL_TARGET)/defaults/pref + $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(ACDEFINES) $^ > $(FINAL_TARGET)/defaults/pref/channel-prefs.js endif libs:: $(srcdir)/blocklist.xml - $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin + $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) diff --git a/browser/app/profile/extensions/Makefile.in b/browser/app/profile/extensions/Makefile.in index fb9a5d1c9bb..b6edcc60629 100644 --- a/browser/app/profile/extensions/Makefile.in +++ b/browser/app/profile/extensions/Makefile.in @@ -8,7 +8,7 @@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -DISTROEXT = $(call core_abspath,$(DIST))/bin/distribution/extensions +DISTROEXT = $(call core_abspath,$(FINAL_TARGET))/distribution/extensions include $(DEPTH)/config/autoconf.mk diff --git a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in index 9f245b98b9a..05be4f37773 100644 --- a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in +++ b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in @@ -17,9 +17,6 @@ FILES := \ libs:: $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf.in > install.rdf - $(INSTALL) $(FILES) $(DIST)/bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} + $(INSTALL) $(FILES) $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -install:: - $(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} - GARBAGE += $(FILES) diff --git a/browser/extensions/Makefile.in b/browser/extensions/Makefile.in index b4d622a1dbf..51fa8ddc851 100644 --- a/browser/extensions/Makefile.in +++ b/browser/extensions/Makefile.in @@ -7,7 +7,7 @@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -CHROMEDIR = $(call core_abspath,$(DIST))/bin/chrome +CHROMEDIR = $(call core_abspath,$(FINAL_TARGET))/chrome include $(DEPTH)/config/autoconf.mk @@ -23,13 +23,13 @@ exclude_files = \ icon64.png \ $(NULL) -$(DIST)/bin/chrome/pdfjs.manifest: $(GLOBAL_DEPS) +$(FINAL_TARGET)/chrome/pdfjs.manifest: $(GLOBAL_DEPS) printf "manifest pdfjs/chrome.manifest" > $@ -libs:: $(DIST)/bin/chrome/pdfjs.manifest +libs:: $(FINAL_TARGET)/chrome/pdfjs.manifest $(PYTHON) $(topsrcdir)/config/nsinstall.py \ $(srcdir)/pdfjs \ $(foreach exclude,$(exclude_files), -X $(srcdir)/pdfjs/$(exclude)) \ - $(DIST)/bin/chrome + $(FINAL_TARGET)/chrome $(PYTHON) $(MOZILLA_DIR)/config/buildlist.py \ - $(DIST)/bin/chrome.manifest "manifest chrome/pdfjs.manifest" + $(FINAL_TARGET)/chrome.manifest "manifest chrome/pdfjs.manifest" diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index f42d9f27fbb..4a4807d27ac 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -198,17 +198,19 @@ installers-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-% @echo "repackaging done" ifdef MOZ_UPDATER +# Note that we want updater.ini to be in the top directory, not the browser/ +# subdirectory, because that's where the updater is installed and runs. libs:: $(call MERGE_FILE,updater/updater.ini) ifeq ($(OS_ARCH),WINNT) cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \ sed -e "s/^InfoText=/Info=/" -e "s/^TitleText=/Title=/" | \ sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" > \ - $(FINAL_TARGET)/updater.ini + $(DIST)/bin/updater.ini else cat $< | \ sed -e "s/^InfoText=/Info=/" -e "s/^TitleText=/Title=/" | \ sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" > \ - $(FINAL_TARGET)/updater.ini + $(DIST)/bin/updater.ini endif endif