1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
3 # Parent dbca8a673de340999f67eb321169b44cc4109faf |
3 # Parent e10e9bf6ab3a74655998bd0286d248f5d17a601a |
4 |
4 |
5 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
5 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
6 --- a/browser/app/Makefile.in |
6 --- a/browser/app/Makefile.in |
7 +++ b/browser/app/Makefile.in |
7 +++ b/browser/app/Makefile.in |
8 @@ -55,16 +55,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
8 @@ -55,16 +55,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
19 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default |
19 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default |
20 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default |
20 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default |
21 +endif |
21 +endif |
22 endif |
22 endif |
23 |
23 |
24 ifndef LIBXUL_SDK |
|
25 # channel-prefs.js is handled separate from other prefs due to bug 756325 |
24 # channel-prefs.js is handled separate from other prefs due to bug 756325 |
26 libs:: $(srcdir)/profile/channel-prefs.js |
25 libs:: $(srcdir)/profile/channel-prefs.js |
27 $(NSINSTALL) -D $(DIST)/bin/defaults/pref |
26 $(NSINSTALL) -D $(DIST)/bin/defaults/pref |
28 $(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js) |
27 $(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js) |
29 endif |
28 |
|
29 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
30 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild |
30 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild |
31 --- a/browser/branding/branding-common.mozbuild |
31 --- a/browser/branding/branding-common.mozbuild |
32 +++ b/browser/branding/branding-common.mozbuild |
32 +++ b/browser/branding/branding-common.mozbuild |
33 @@ -32,12 +32,15 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
33 @@ -32,12 +32,15 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
34 'disk.icns', |
34 'disk.icns', |
47 'mozicon128.png', |
47 'mozicon128.png', |
48 ] |
48 ] |
49 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
49 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
50 --- a/browser/installer/package-manifest.in |
50 --- a/browser/installer/package-manifest.in |
51 +++ b/browser/installer/package-manifest.in |
51 +++ b/browser/installer/package-manifest.in |
52 @@ -669,18 +669,21 @@ |
52 @@ -670,18 +670,21 @@ |
53 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
53 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
54 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
54 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
55 @RESPATH@/chrome/toolkit@JAREXT@ |
55 @RESPATH@/chrome/toolkit@JAREXT@ |
56 @RESPATH@/chrome/toolkit.manifest |
56 @RESPATH@/chrome/toolkit.manifest |
57 @RESPATH@/chrome/recording.manifest |
57 @RESPATH@/chrome/recording.manifest |