1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 8f03aa18c51f9c014f32aba7750f6b7927f9256e |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
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 @@ -75,16 +75,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
7 @@ -62,16 +62,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
8 endif |
8 endif |
9 |
9 |
10 ifdef MOZ_WIDGET_GTK |
10 ifdef MOZ_WIDGET_GTK |
11 libs:: |
11 libs:: |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons |
18 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default |
18 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default |
19 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/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 |
|
24 $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile |
|
25 |
|
26 ifndef LIBXUL_SDK |
23 ifndef LIBXUL_SDK |
27 # 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 |
28 libs:: $(srcdir)/profile/channel-prefs.js |
25 libs:: $(srcdir)/profile/channel-prefs.js |
|
26 $(NSINSTALL) -D $(DIST)/bin/defaults/pref |
|
27 $(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js) |
|
28 endif |
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 @@ BRANDING_FILES := \ |
32 @@ -35,18 +35,21 @@ BRANDING_FILES := \ |
33 document.icns \ |
33 document.icns \ |
52 INSTALL_TARGETS += BRANDING |
52 INSTALL_TARGETS += BRANDING |
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 @@ -623,18 +623,21 @@ |
57 @@ -654,18 +654,21 @@ |
58 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
58 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
59 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
59 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
60 @BINPATH@/chrome/toolkit@JAREXT@ |
60 @RESPATH@/chrome/toolkit@JAREXT@ |
61 @BINPATH@/chrome/toolkit.manifest |
61 @RESPATH@/chrome/toolkit.manifest |
62 @BINPATH@/chrome/recording.manifest |
62 @RESPATH@/chrome/recording.manifest |
63 @BINPATH@/chrome/recording/* |
63 @RESPATH@/chrome/recording/* |
64 #ifdef MOZ_GTK |
64 #ifdef MOZ_GTK |
65 @BINPATH@/browser/chrome/icons/default/default16.png |
65 @RESPATH@/browser/chrome/icons/default/default16.png |
66 +@BINPATH@/browser/chrome/icons/default/default22.png |
66 +@RESPATH@/browser/chrome/icons/default/default22.png |
67 +@BINPATH@/browser/chrome/icons/default/default24.png |
67 +@RESPATH@/browser/chrome/icons/default/default24.png |
68 @BINPATH@/browser/chrome/icons/default/default32.png |
68 @RESPATH@/browser/chrome/icons/default/default32.png |
69 @BINPATH@/browser/chrome/icons/default/default48.png |
69 @RESPATH@/browser/chrome/icons/default/default48.png |
70 +@BINPATH@/browser/chrome/icons/default/default256.png |
70 +@RESPATH@/browser/chrome/icons/default/default256.png |
71 #endif |
71 #endif |
72 |
72 |
73 ; [Webide Files] |
73 ; [Webide Files] |
74 @BINPATH@/browser/chrome/webide@JAREXT@ |
74 @RESPATH@/browser/chrome/webide@JAREXT@ |
75 @BINPATH@/browser/chrome/webide.manifest |
75 @RESPATH@/browser/chrome/webide.manifest |
76 @BINPATH@/browser/@PREF_DIR@/webide-prefs.js |
76 @RESPATH@/browser/@PREF_DIR@/webide-prefs.js |
77 |
77 |
78 ; shell icons |
78 ; shell icons |