1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent a5cc092ab98bc6d4c1b09b5cc86791bae1313c73 |
2 # Parent 5defe7bd2f041c227fe4a65f8a90e6cc42a9a339 |
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 @@ -136,16 +136,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
7 @@ -133,16 +133,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
8 endif |
8 endif |
9 |
9 |
10 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
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 |
13 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default |
13 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default |
14 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default |
14 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default |
15 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default |
15 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default |
52 firefox-os2.ico \ |
52 firefox-os2.ico \ |
53 document-os2.ico \ |
53 document-os2.ico \ |
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 @@ -574,18 +574,21 @@ |
57 @@ -571,18 +571,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 |
63 @BINPATH@/chrome/recording/* |
63 @BINPATH@/chrome/recording/* |
64 #ifdef MOZ_GTK2 |
64 #ifdef MOZ_GTK |
65 @BINPATH@/browser/chrome/icons/default/default16.png |
65 @BINPATH@/browser/chrome/icons/default/default16.png |
66 +@BINPATH@/browser/chrome/icons/default/default22.png |
66 +@BINPATH@/browser/chrome/icons/default/default22.png |
67 +@BINPATH@/browser/chrome/icons/default/default24.png |
67 +@BINPATH@/browser/chrome/icons/default/default24.png |
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 |