equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 9745e5d5cdc7e91dbfc5582b49881668cb6725f7 |
2 # Parent 17ccae9100af86bc65f924b87545184af2f4ada9 |
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 @@ -76,16 +76,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
7 @@ -75,16 +75,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 |
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 @@ -613,18 +613,21 @@ |
57 @@ -629,18 +629,21 @@ |
58 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
58 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
59 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
59 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
60 @BINPATH@/chrome/toolkit@JAREXT@ |
60 @BINPATH@/chrome/toolkit@JAREXT@ |
61 @BINPATH@/chrome/toolkit.manifest |
61 @BINPATH@/chrome/toolkit.manifest |
62 @BINPATH@/chrome/recording.manifest |
62 @BINPATH@/chrome/recording.manifest |
68 @BINPATH@/browser/chrome/icons/default/default32.png |
68 @BINPATH@/browser/chrome/icons/default/default32.png |
69 @BINPATH@/browser/chrome/icons/default/default48.png |
69 @BINPATH@/browser/chrome/icons/default/default48.png |
70 +@BINPATH@/browser/chrome/icons/default/default256.png |
70 +@BINPATH@/browser/chrome/icons/default/default256.png |
71 #endif |
71 #endif |
72 |
72 |
73 ; shell icons |
73 ; [Webide Files] |
74 #ifdef XP_UNIX |
74 #ifdef MOZ_DEVTOOLS_WEBIDE |
75 #ifndef XP_MACOSX |
75 @BINPATH@/browser/chrome/webide@JAREXT@ |
76 ; shell icons |
76 @BINPATH@/browser/chrome/webide.manifest |
77 @BINPATH@/browser/icons/*.png |
77 @BINPATH@/browser/@PREF_DIR@/webide-prefs.js |
78 #ifdef MOZ_UPDATER |
78 #endif |