1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 7272ee3a4df832b885fec122f02d32f23dcc9cdb |
2 # Parent ab9210b3779914924d12de5a3952d4cc52cd9d78 |
3 |
3 |
4 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
4 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
5 --- a/browser/app/Makefile.in |
5 --- a/browser/app/Makefile.in |
6 +++ b/browser/app/Makefile.in |
6 +++ b/browser/app/Makefile.in |
7 @@ -127,16 +127,21 @@ endif |
7 @@ -133,16 +133,21 @@ endif |
8 endif #} LIBXUL_SDK |
8 endif #} LIBXUL_SDK |
9 |
9 |
10 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
10 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
11 libs:: |
11 libs:: |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons |
13 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default |
13 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default |
14 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default |
14 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default |
15 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default |
15 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default |
16 +ifdef MOZ_OFFICIAL_BRANDING |
16 +ifdef MOZ_OFFICIAL_BRANDING |
17 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(DIST)/bin/chrome/icons/default |
17 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(FINAL_TARGET)/chrome/icons/default |
18 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(DIST)/bin/chrome/icons/default |
18 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default |
19 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(DIST)/bin/chrome/icons/default |
19 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default |
20 +endif |
20 +endif |
21 endif |
21 endif |
22 |
22 |
23 libs:: $(srcdir)/profile/prefs.js |
23 libs:: $(srcdir)/profile/prefs.js |
24 $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile |
24 $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile |
25 |
25 |
26 ifndef LIBXUL_SDK |
26 ifndef LIBXUL_SDK |
27 # channel-prefs.js is handled separate from other prefs due to bug 756325 |
27 # channel-prefs.js is handled separate from other prefs due to bug 756325 |
28 libs:: $(srcdir)/profile/channel-prefs.js |
28 libs:: $(srcdir)/profile/channel-prefs.js |
29 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in |
29 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in |
30 --- a/browser/branding/official/Makefile.in |
30 --- a/browser/branding/official/Makefile.in |
31 +++ b/browser/branding/official/Makefile.in |
31 +++ b/browser/branding/official/Makefile.in |
32 @@ -35,18 +35,21 @@ OSX_BRANDING_FILES = \ |
32 @@ -42,18 +42,21 @@ OSX_BRANDING_FILES = \ |
33 firefox.icns \ |
33 firefox.icns \ |
34 disk.icns \ |
34 disk.icns \ |
35 document.icns \ |
35 document.icns \ |
36 dsstore \ |
36 dsstore \ |
37 $(NULL) |
37 $(NULL) |
52 $(NULL) |
52 $(NULL) |
53 |
53 |
54 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
54 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
55 --- a/browser/installer/package-manifest.in |
55 --- a/browser/installer/package-manifest.in |
56 +++ b/browser/installer/package-manifest.in |
56 +++ b/browser/installer/package-manifest.in |
57 @@ -496,18 +496,21 @@ |
57 @@ -541,18 +541,21 @@ |
58 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
58 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
59 #ifdef SHIP_FEEDBACK |
59 #ifdef SHIP_FEEDBACK |
60 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
60 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
61 #endif |
61 #endif |
62 @BINPATH@/chrome/toolkit@JAREXT@ |
62 @BINPATH@/chrome/toolkit@JAREXT@ |