From e0fb9deb3fec78f0bd6a0c9e99d1a2453cd58b5e Mon Sep 17 00:00:00 2001 From: Mike Shal Date: Thu, 31 Mar 2016 17:12:11 -0400 Subject: [PATCH] Bug 1261474 - Remove custom install rules in browser/app/Makefile.in; r=chmanchester MozReview-Commit-ID: K2FTdBaIWPI --- browser/app/Makefile.in | 8 -------- browser/app/moz.build | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 4f5d6185f1e7..778b661e4512 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -46,14 +46,6 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, firefox.js) endif -ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT))) -libs:: - $(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 - # 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 diff --git a/browser/app/moz.build b/browser/app/moz.build index 89989230343f..e5436dcc4c53 100644 --- a/browser/app/moz.build +++ b/browser/app/moz.build @@ -23,6 +23,14 @@ FINAL_TARGET_FILES += ['blocklist.xml'] FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js'] FINAL_TARGET_FILES.defaults += ['permissions'] +if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: + FINAL_TARGET_FILES.icons += ['!/dist/branding/mozicon128.png'] + FINAL_TARGET_FILES.chrome.icons.default += [ + '!/dist/branding/default16.png', + '!/dist/branding/default32.png', + '!/dist/branding/default48.png', + ] + DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] LOCAL_INCLUDES += [