equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent efffa19fa0b2530d2aca1ebd5b885a6fc68e51de |
2 # Parent d6bb5c163142d233d00e739e21aa9df16077873e |
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 @@ -169,16 +169,21 @@ endif # LIBXUL_SDK |
7 @@ -164,16 +164,21 @@ endif # LIBXUL_SDK |
8 DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" |
8 DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" |
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 $(DIST)/bin/icons |
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 @@ -424,18 +424,21 @@ |
57 @@ -432,18 +432,21 @@ |
|
58 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png |
58 #ifdef SHIP_FEEDBACK |
59 #ifdef SHIP_FEEDBACK |
59 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
60 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
60 #endif |
61 #endif |
61 @BINPATH@/chrome/toolkit@JAREXT@ |
62 @BINPATH@/chrome/toolkit@JAREXT@ |
62 @BINPATH@/chrome/toolkit.manifest |
63 @BINPATH@/chrome/toolkit.manifest |
63 #ifdef XP_UNIX |
64 #ifdef MOZ_GTK2 |
64 #ifndef XP_MACOSX |
|
65 @BINPATH@/chrome/icons/default/default16.png |
65 @BINPATH@/chrome/icons/default/default16.png |
66 +@BINPATH@/chrome/icons/default/default22.png |
66 +@BINPATH@/chrome/icons/default/default22.png |
67 +@BINPATH@/chrome/icons/default/default24.png |
67 +@BINPATH@/chrome/icons/default/default24.png |
68 @BINPATH@/chrome/icons/default/default32.png |
68 @BINPATH@/chrome/icons/default/default32.png |
69 @BINPATH@/chrome/icons/default/default48.png |
69 @BINPATH@/chrome/icons/default/default48.png |
70 +@BINPATH@/chrome/icons/default/default256.png |
70 +@BINPATH@/chrome/icons/default/default256.png |
71 #endif |
71 #endif |
72 #endif |
|
73 |
|
74 |
72 |
75 ; shell icons |
73 ; shell icons |
76 #ifdef XP_UNIX |
74 #ifdef XP_UNIX |
77 #ifndef XP_MACOSX |
75 #ifndef XP_MACOSX |
78 @BINPATH@/icons/*.xpm |
76 @BINPATH@/icons/*.xpm |
|
77 @BINPATH@/icons/*.png |
|
78 #endif |