Bug 1048042 - Port |Bug 780159 - Remove obsolete REGCHROME| and |Bug 935387 - Remove non recursed install targets| to comm-central r=standard8 not part of standard build a=CLOSED TREE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Wed, 06 Aug 2014 18:04:51 +0100
changeset 20705 c6e6b13f53196b81aa7b059e04526669fa944ec6
parent 20704 ca8e0f9aa2cd3810b229b0fff58866447fac4100
child 20706 b41ea6d553587468900fb07eac619e2e968f7438
push id1234
push usermbanner@mozilla.com
push dateMon, 13 Oct 2014 17:59:18 +0000
treeherdercomm-beta@12633210f163 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersstandard8, CLOSED
bugs1048042, 780159, 935387
Bug 1048042 - Port |Bug 780159 - Remove obsolete REGCHROME| and |Bug 935387 - Remove non recursed install targets| to comm-central r=standard8 not part of standard build a=CLOSED TREE
calendar/base/backend/icaljs/Makefile.in
calendar/base/src/Makefile.in
calendar/import-export/Makefile.in
calendar/providers/caldav/Makefile.in
calendar/providers/gdata/components/Makefile.in
calendar/providers/wcap/Makefile.in
im/app/profile/Makefile.in
im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
im/locales/Makefile.in
mail/app/Makefile.in
mail/app/profile/Makefile.in
mail/locales/Makefile.in
mail/themes/linux/Makefile.in
mail/themes/osx/Makefile.in
mail/themes/windows/Makefile.in
mailnews/base/ispdata/Makefile.in
mailnews/base/search/src/Makefile.in
mailnews/extensions/dsn/Makefile.in
mailnews/extensions/mailviews/content/Makefile.in
mailnews/extensions/mdn/Makefile.in
mailnews/extensions/newsblog/Makefile.in
mailnews/extensions/smime/Makefile.in
suite/app/Makefile.in
suite/branding/nightly/Makefile.in
suite/locales/Makefile.in
suite/themes/classic/Makefile.in
--- a/calendar/base/backend/icaljs/Makefile.in
+++ b/calendar/base/backend/icaljs/Makefile.in
@@ -34,13 +34,9 @@ libs:: $(BACKEND_MANIFESTS)
 	$(NSINSTALL) -D $(FINAL_TARGET)/components; \
 	for i in $^; do \
 	  fname=`basename $$i`; \
 	  dest=$(FINAL_TARGET)/components/$${fname}; \
 	  $(RM) -f $$dest; \
 	  $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $$i -o $$dest; \
 	done
 
-# The install target must use SYSINSTALL, which is NSINSTALL in copy mode.
-install:: $(EXTRA_SCRIPTS)
-	$(call install_cmd,$(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/calendar-js)
-
 include $(topsrcdir)/config/rules.mk
--- a/calendar/base/src/Makefile.in
+++ b/calendar/base/src/Makefile.in
@@ -40,13 +40,9 @@ EXTRA_SCRIPTS = \
     calCalendarSearchService.js \
     $(NULL)
 
 # Use NSINSTALL to make the directory, as there's no mtime to preserve.
 libs:: $(EXTRA_SCRIPTS)
 	if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
 	$(INSTALL) $^ $(FINAL_TARGET)/calendar-js
 
-# The install target must use SYSINSTALL, which is NSINSTALL in copy mode.
-install:: $(EXTRA_SCRIPTS)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/calendar-js
-
 include $(topsrcdir)/config/rules.mk
--- a/calendar/import-export/Makefile.in
+++ b/calendar/import-export/Makefile.in
@@ -19,13 +19,9 @@ EXTRA_SCRIPTS = \
     calWeekPrinter.js \
     $(NULL)
 
 # Use NSINSTALL to make the directory, as there's no mtime to preserve.
 libs:: $(EXTRA_SCRIPTS)
 	if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
 	$(INSTALL) $^ $(FINAL_TARGET)/calendar-js
 
-# The install target must use SYSINSTALL, which is NSINSTALL in copy mode.
-install:: $(EXTRA_SCRIPTS)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/calendar-js
-
 include $(topsrcdir)/config/rules.mk
--- a/calendar/providers/caldav/Makefile.in
+++ b/calendar/providers/caldav/Makefile.in
@@ -10,13 +10,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 EXTRA_SCRIPTS = calDavRequestHandlers.js
 
 libs:: $(EXTRA_SCRIPTS)
 	if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
 	$(INSTALL) $^ $(FINAL_TARGET)/calendar-js
 
-# The install target must use SYSINSTALL, which is NSINSTALL in copy mode.
-install:: $(EXTRA_SCRIPTS)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/calendar-js
-
 include $(topsrcdir)/config/rules.mk
--- a/calendar/providers/gdata/components/Makefile.in
+++ b/calendar/providers/gdata/components/Makefile.in
@@ -16,13 +16,9 @@ EXTRA_SCRIPTS = \
     calGoogleUtils.js \
     $(NULL)
 
 # Use NSINSTALL to make the directory, as there's no mtime to preserve.
 libs:: $(EXTRA_SCRIPTS)
 	if test ! -d $(FINAL_TARGET)/js; then $(NSINSTALL) -D $(FINAL_TARGET)/js; fi
 	$(INSTALL) $^ $(FINAL_TARGET)/js
 
-# The install target must use SYSINSTALL, which is NSINSTALL in copy mode.
-install:: $(EXTRA_SCRIPTS)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/js
-
 include $(topsrcdir)/config/rules.mk
--- a/calendar/providers/wcap/Makefile.in
+++ b/calendar/providers/wcap/Makefile.in
@@ -17,13 +17,9 @@ EXTRA_SCRIPTS = \
                 calWcapCalendarItems.js \
                 calWcapCalendar.js \
                 $(NULL)
 
 libs:: $(EXTRA_SCRIPTS)
 	if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
 	$(INSTALL) $^ $(FINAL_TARGET)/calendar-js
 
-# using SYSINSTALL (i.e. NSINSTALL in copy mode):
-install:: $(EXTRA_SCRIPTS)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/calendar-js
-
 include $(topsrcdir)/config/rules.mk
--- a/im/app/profile/Makefile.in
+++ b/im/app/profile/Makefile.in
@@ -16,15 +16,11 @@ FILES := \
 	mimeTypes.rdf \
     localstore.rdf \
 	$(NULL)
 
 libs:: $(FILES)
 	$(SYSINSTALL) $^ $(DIST)/bin/defaults/profile
 	$(SYSINSTALL) $^ $(DIST)/bin/defaults/profile/US
 
-install:: $(FILES)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/US
-
 ifneq (,$(filter gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DHAVE_SHELL_SERVICE=1
 endif
--- a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
+++ b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
@@ -20,12 +20,9 @@ FILES := \
 	$(NULL)
 
 install.rdf: install.rdf.in
 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $< -o $@)
 
 libs:: $(FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DIST)/bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 
-install:: $(FILES)
-	$(SYSINSTALL) $(IFLAGS1) $(foreach f,$^,"$f") $(DESTDIR)$(mozappdir)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-
 GARBAGE += install.rdf
--- a/im/locales/Makefile.in
+++ b/im/locales/Makefile.in
@@ -73,19 +73,16 @@ PKG_INST_PATH =
 $(DIST)/branding:
 	$(NSINSTALL) -D $@
 
 SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt))
 
 libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
 
-install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
-
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../mozilla/toolkit/locales libs-$*
 	@$(MAKE) -C ../../chat/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../mozilla/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../mozilla/intl/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -156,30 +156,21 @@ BRANDED_ICONS = \
 DESKTOP_ICON_FILES = $(addsuffix $(ICON_SUFFIX), $(DESKTOP_ICONS) $(DESKTOP_ICONS_SMALL))
 BRANDED_ICON_FILES = $(addsuffix $(ICON_SUFFIX), $(BRANDED_ICONS) $(BRANDED_ICONS_SMALL))
 
 libs:: $(addprefix icons/$(MOZ_WIDGET_TOOLKIT)/,$(DESKTOP_ICON_FILES))
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/chrome/icons/default
 
 libs:: $(addprefix $(DIST)/branding/,$(BRANDED_ICON_FILES))
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/chrome/icons/default
-
-install:: $(addprefix icons/$(MOZ_WIDGET_TOOLKIT)/,$(DESKTOP_ICON_FILES))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
-
-install:: $(addprefix $(DIST)/branding,$(BRANDED_ICON_FILES))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 libs::
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default
 endif
 
 libs:: $(srcdir)/profile/prefs.js
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
 
 libs:: $(srcdir)/blocklist.xml
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
 
--- a/mail/app/profile/Makefile.in
+++ b/mail/app/profile/Makefile.in
@@ -14,11 +14,8 @@ include $(topsrcdir)/config/rules.mk
 
 FILES := \
 	mimeTypes.rdf \
 	localstore.rdf \
 	$(NULL)
 
 libs:: $(FILES)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
-
-install:: $(FILES)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -68,19 +68,16 @@ include $(topsrcdir)/mozilla/toolkit/loc
 $(DIST)/branding:
 	$(NSINSTALL) -D $@
 
 SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt))
 
 libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
 
-install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
-
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../mozilla/toolkit/locales libs-$*
 	@$(MAKE) -C ../../chat/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../editor/ui/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../mozilla/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../mozilla/intl/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
--- a/mail/themes/linux/Makefile.in
+++ b/mail/themes/linux/Makefile.in
@@ -16,11 +16,8 @@ CLASSIC_EXTENSION_DIR = {972ce4c6-7e08-4
 FILES := \
   mail/icon.png \
   mail/preview.png \
   mail/chrome.manifest \
   $(NULL)
 
 libs:: $(FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)
-
-install:: $(FILES)
-	$(SYSINSTALL) $(IFLAGS1) $(foreach f,$^,"$f") $(DESTDIR)$(mozappdir)/extensions/$(CLASSIC_EXTENSION_DIR)
--- a/mail/themes/osx/Makefile.in
+++ b/mail/themes/osx/Makefile.in
@@ -16,11 +16,8 @@ CLASSIC_EXTENSION_DIR = {972ce4c6-7e08-4
 FILES := \
   mail/icon.png \
   mail/preview.png \
   mail/chrome.manifest \
   $(NULL)
 
 libs:: $(FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)
-
-install:: $(FILES)
-	$(SYSINSTALL) $(IFLAGS1) $(foreach f,$^,"$f") $(DESTDIR)$(mozappdir)/extensions/$(CLASSIC_EXTENSION_DIR)
--- a/mail/themes/windows/Makefile.in
+++ b/mail/themes/windows/Makefile.in
@@ -16,11 +16,8 @@ CLASSIC_EXTENSION_DIR = {972ce4c6-7e08-4
 FILES := \
   mail/icon.png \
   mail/preview.png \
   mail/chrome.manifest \
   $(NULL)
 
 libs:: $(FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)
-
-install:: $(FILES)
-	$(SYSINSTALL) $(IFLAGS1) $(foreach f,$^,"$f") $(DESTDIR)$(mozappdir)/extensions/$(CLASSIC_EXTENSION_DIR)
--- a/mailnews/base/ispdata/Makefile.in
+++ b/mailnews/base/ispdata/Makefile.in
@@ -27,12 +27,9 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
 GARBAGE		+= $(addprefix $(EXPORT_DIR)/, $(EXPORT_RESOURCE_FILES)) 
 
 ifneq ($(EXPORT_RESOURCE_FILES),$(NULL))
 libs:: $(EXPORT_RESOURCE_FILES)
 	$(INSTALL) $^ $(EXPORT_DIR)
-
-install:: $(EXPORT_RESOURCE_FILES)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/isp
 endif
--- a/mailnews/base/search/src/Makefile.in
+++ b/mailnews/base/search/src/Makefile.in
@@ -22,11 +22,8 @@ EXPORT_RESOURCE_FILES	= \
 			        $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 GARBAGE += $(addprefix $(EXPORT_DIR)/, $(EXPORT_RESOURCE_FILES)) 
 
 libs:: $(EXPORT_RESOURCE_FILES)
 	 $(INSTALL) $^ $(EXPORT_DIR)
-
-install:: $(EXPORT_RESOURCE_FILES)
-	    $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/isp
--- a/mailnews/extensions/dsn/Makefile.in
+++ b/mailnews/extensions/dsn/Makefile.in
@@ -9,12 +9,8 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(INSTALL) $(srcdir)/content/dsn.js $(DIST)/bin/defaults/pref
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/content/dsn.js $(DESTDIR)$(mozappdir)/defaults/pref
-
--- a/mailnews/extensions/mailviews/content/Makefile.in
+++ b/mailnews/extensions/mailviews/content/Makefile.in
@@ -17,12 +17,8 @@ EXPORT_RESOURCE_FILES	= \
 			$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 GARBAGE		+= $(addprefix $(EXPORT_DIR)/, $(EXPORT_RESOURCE_FILES))
 
 libs:: $(EXPORT_RESOURCE_FILES)
 	$(INSTALL) $^ $(EXPORT_DIR)
-
-install:: $(EXPORT_RESOURCE_FILES)
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/messenger
-
--- a/mailnews/extensions/mdn/Makefile.in
+++ b/mailnews/extensions/mdn/Makefile.in
@@ -9,11 +9,8 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(INSTALL) $(srcdir)/content/mdn.js $(DIST)/bin/defaults/pref
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/content/mdn.js $(DESTDIR)$(mozappdir)/defaults/pref
--- a/mailnews/extensions/newsblog/Makefile.in
+++ b/mailnews/extensions/newsblog/Makefile.in
@@ -21,12 +21,9 @@ include $(DEPTH)/config/autoconf.mk
 
 EXPORT_DIR	= $(DIST)/bin/isp
 
 GARBAGE += $(EXPORT_DIR)/rss.rdf 
 
 libs:: rss.rdf
 	$(INSTALL) $^ $(EXPORT_DIR)
 
-install:: rss.rdf
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/isp
-
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/extensions/smime/Makefile.in
+++ b/mailnews/extensions/smime/Makefile.in
@@ -9,11 +9,8 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(INSTALL) $(srcdir)/content/smime.js $(DIST)/bin/defaults/pref
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/content/smime.js $(DESTDIR)$(mozappdir)/defaults/pref
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -108,19 +108,16 @@ ifneq (,$(filter-out WINNT Darwin,$(OS_A
 	@sed -e "s|\@bindir\@|$(bindir)|g" -e "s|\@mozappdir\@|$(mozappdir)|g" \
 		-e "s|\@MOZ_APP_DISPLAYNAME\@|$(MOZ_APP_DISPLAYNAME)|g" \
 		-e "s|\@MOZ_APP_NAME\@|$(MOZ_APP_NAME)|g" \
 		-e "s|\@MOZ_APP_VERSION\@|${MOZ_APP_VERSION}|g" < $< > $@
 
 libs:: $(MOZ_APP_NAME).1
 	$(INSTALL) $< $(DIST)/man/man1
 
-install:: $(MOZ_APP_NAME).1
-	$(SYSINSTALL) $(IFLAGS1) $< $(DESTDIR)$(mandir)/man1
-
 GARBAGE += $(MOZ_APP_NAME).1
 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, browser-prefs.js)
 endif
 
 ifdef MOZ_OMNIJAR
 # Make extensions end up as XPIs instead of flat chrome when doing omni.jar.
 # APP_EXTENSIONS exist only bundled with the application,
 # PROFILE_EXTENSIONS will be copied to the profile in installed builds.
--- a/suite/branding/nightly/Makefile.in
+++ b/suite/branding/nightly/Makefile.in
@@ -55,34 +55,28 @@ DESKTOP_ICONS += \
 	xul-file \
 	$(NULL)
 endif
 
 ifeq ($(ICON_DIR),gtk)
 libs:: icons/gtk/seamonkey.png
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/chrome/icons/default
 
-install:: icons/gtk/seamonkey.png
-	$(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
-
 GARBAGE	+= $(DIST)/bin/chrome/icons/default/seamonkey.png
 
 DESKTOP_ICONS += default
 DESKTOP_ICONS_SMALL = $(patsubst %,%16,$(DESKTOP_ICONS))
 DESKTOP_ICONS_LARGE = $(patsubst %,%48,$(DESKTOP_ICONS))
 endif
 
 DESKTOP_ICON_FILES = $(addsuffix $(ICON_SUFFIX), $(DESKTOP_ICONS) $(DESKTOP_ICONS_SMALL) $(DESKTOP_ICONS_LARGE))
 
 libs:: $(addprefix icons/$(ICON_DIR)/,$(DESKTOP_ICON_FILES))
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/chrome/icons/default
 
-install:: $(addprefix icons/$(ICON_DIR)/,$(DESKTOP_ICON_FILES))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
-
 GARBAGE	+= $(addprefix $(DIST)/bin/chrome/icons/default/,$(DESKTOP_ICON_FILES))
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 export::
 	$(NSINSTALL) -D $(DIST)/branding
 ifeq ($(OS_ARCH),WINNT)
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -115,33 +115,21 @@ libs:: $(FINAL_TARGET)/defaults/profile/
 libs:: $(FINAL_TARGET)/defaults/profile/panels.rdf ;
 
 libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
 
 libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
 
-install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ;
-install:: $(DESTDIR)$(mozappdir)/defaults/profile/panels.rdf ;
-
-install:: $(addprefix generic/profile/,$(PROFILE_FILES))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
-
-install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome
-
 SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,searchplugins/list.txt))
 
 libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
 
-install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
-
 # Extend l10n.mk clobber-% target for our localised extensions
 clobber-%:
 	$(RM) -rf $(DIST)/xpi-stage/chatzilla-$* $(DIST)/xpi-stage/chatzilla-*.$*.xpi
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../mozilla/toolkit/locales libs-$*
 	@$(MAKE) -C ../../mozilla/services/sync/locales AB_CD=$* XPI_NAME=locale-$*
--- a/suite/themes/classic/Makefile.in
+++ b/suite/themes/classic/Makefile.in
@@ -19,12 +19,8 @@ FILES = \
 	$(srcdir)/chrome.manifest \
 	$(srcdir)/icon.png \
 	$(srcdir)/preview.png \
 	$(NULL)
 
 libs::
 	$(INSTALL) $(FILES) $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)
 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf -o $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)/install.rdf)
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/extensions/$(CLASSIC_EXTENSION_DIR)
-	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf -o $(DESTDIR)$(mozappdir)/extensions/$(CLASSIC_EXTENSION_DIR)/install.rdf)