diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-04-14 14:26:29 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-04-14 14:26:29 -0400 |
| commit | d594ed2896519b1766cc3b11af118cb401d6336a (patch) | |
| tree | 2278ec73ebed855f643984fa69b19032b21ad27a /application | |
| parent | b189d04718557493ade6849798f3aba763089c4c (diff) | |
| download | UXP-d594ed2896519b1766cc3b11af118cb401d6336a.tar UXP-d594ed2896519b1766cc3b11af118cb401d6336a.tar.gz UXP-d594ed2896519b1766cc3b11af118cb401d6336a.tar.lz UXP-d594ed2896519b1766cc3b11af118cb401d6336a.tar.xz UXP-d594ed2896519b1766cc3b11af118cb401d6336a.zip | |
[PALEMOON] Move linux icons to moz.build
Diffstat (limited to 'application')
| -rw-r--r-- | application/palemoon/app/Makefile.in | 8 | ||||
| -rw-r--r-- | application/palemoon/branding/shared/branding.mozbuild | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/application/palemoon/app/Makefile.in b/application/palemoon/app/Makefile.in index 580fcb164..6f9bbfaf0 100644 --- a/application/palemoon/app/Makefile.in +++ b/application/palemoon/app/Makefile.in @@ -54,14 +54,6 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, palemoon.js) endif -ifdef MOZ_WIDGET_GTK -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 - ifndef LIBXUL_SDK # channel-prefs.js is handled separate from other prefs due to bug 756325 libs:: $(srcdir)/profile/channel-prefs.js diff --git a/application/palemoon/branding/shared/branding.mozbuild b/application/palemoon/branding/shared/branding.mozbuild index fc832dbe7..4157a8159 100644 --- a/application/palemoon/branding/shared/branding.mozbuild +++ b/application/palemoon/branding/shared/branding.mozbuild @@ -45,6 +45,12 @@ def ApplicationBranding(): 'default48.png', 'mozicon128.png', ] + FINAL_TARGET_FILES.icons += ['mozicon128.png'] + FINAL_TARGET_FILES.chrome.icons.default += [ + 'default16.png', + 'default32.png', + 'default48.png', + ] DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] DEFINES['MOZ_BRANDING_DIRECTORY'] = CONFIG['MOZ_BRANDING_DIRECTORY'] |