252
|
1 |
# HG changeset patch
|
|
2 |
# Parent 33dfbc62844ac4883fbedb77d782a1b9ef5596c4
|
|
3 |
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
|
|
4 |
--- a/browser/app/Makefile.in
|
|
5 |
+++ b/browser/app/Makefile.in
|
|
6 |
@@ -281,16 +281,21 @@ endif
|
|
7 |
|
|
8 |
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
|
9 |
libs::
|
|
10 |
$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
|
|
11 |
$(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons
|
|
12 |
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
|
|
13 |
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default
|
|
14 |
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default
|
|
15 |
+ifdef MOZ_OFFICIAL_BRANDING
|
|
16 |
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(DIST)/bin/chrome/icons/default
|
|
17 |
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(DIST)/bin/chrome/icons/default
|
|
18 |
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(DIST)/bin/chrome/icons/default
|
|
19 |
+endif
|
|
20 |
endif
|
|
21 |
|
|
22 |
ifdef MOZ_SPLASHSCREEN
|
|
23 |
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
|
24 |
libs::
|
|
25 |
$(INSTALL) $(IFLAGS1) $(DIST)/branding/splash.bmp $(DIST)/bin
|
|
26 |
endif
|
|
27 |
endif
|
|
28 |
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
|
|
29 |
--- a/browser/installer/package-manifest.in
|
|
30 |
+++ b/browser/installer/package-manifest.in
|
|
31 |
@@ -423,18 +423,21 @@
|
|
32 |
#if MOZ_UPDATE_CHANNEL == beta
|
|
33 |
@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
|
|
34 |
#endif
|
|
35 |
@BINPATH@/chrome/toolkit@JAREXT@
|
|
36 |
@BINPATH@/chrome/toolkit.manifest
|
|
37 |
#ifdef XP_UNIX
|
|
38 |
#ifndef XP_MACOSX
|
|
39 |
@BINPATH@/chrome/icons/default/default16.png
|
|
40 |
+@BINPATH@/chrome/icons/default/default22.png
|
|
41 |
+@BINPATH@/chrome/icons/default/default24.png
|
|
42 |
@BINPATH@/chrome/icons/default/default32.png
|
|
43 |
@BINPATH@/chrome/icons/default/default48.png
|
|
44 |
+@BINPATH@/chrome/icons/default/default256.png
|
|
45 |
#endif
|
|
46 |
#endif
|
|
47 |
|
|
48 |
|
|
49 |
; shell icons
|
|
50 |
#ifdef XP_UNIX
|
|
51 |
#ifndef XP_MACOSX
|
|
52 |
@BINPATH@/icons/*.xpm
|
|
53 |
diff --git a/other-licenses/branding/firefox/Makefile.in b/other-licenses/branding/firefox/Makefile.in
|
|
54 |
--- a/other-licenses/branding/firefox/Makefile.in
|
|
55 |
+++ b/other-licenses/branding/firefox/Makefile.in
|
|
56 |
@@ -68,18 +68,21 @@ OSX_BRANDING_FILES = \
|
|
57 |
firefox.icns \
|
|
58 |
disk.icns \
|
|
59 |
document.icns \
|
|
60 |
dsstore \
|
|
61 |
$(NULL)
|
|
62 |
|
|
63 |
LINUX_BRANDING_FILES = \
|
|
64 |
default16.png \
|
|
65 |
+ default22.png \
|
|
66 |
+ default24.png \
|
|
67 |
default32.png \
|
|
68 |
default48.png \
|
|
69 |
+ default256.png \
|
|
70 |
document.png \
|
|
71 |
mozicon128.png \
|
|
72 |
$(NULL)
|
|
73 |
|
|
74 |
OS2_BRANDING_FILES = \
|
|
75 |
firefox-os2.ico \
|
|
76 |
document-os2.ico \
|
|
77 |
$(NULL)
|