Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1261474 - Remove custom install rules in browser/app/Makefile.in; r=chmanchester

Browse Source 
MozReview-Commit-ID: K2FTdBaIWPI
This commit is contained in:
Mike Shal 2016-03-31 17:12:11 -04:00
parent f9107c3ce4
commit e0fb9deb3f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/app/Makefile.in
View File

@ -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

8
browser/app/moz.build
View File

@ -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 += [