equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 6948d58326d5c2e46936e186079421e7d76445e2 |
2 # Parent 87462739809ad0f41fd335f9a68203fd70f9883c |
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 @@ -199,16 +199,21 @@ DEFINES += -DMOZILLA_OFFICIAL |
7 @@ -194,16 +194,21 @@ DEFINES += -DMOZILLA_OFFICIAL |
8 endif |
8 endif |
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 |
18 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(DIST)/bin/chrome/icons/default |
18 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(DIST)/bin/chrome/icons/default |
19 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(DIST)/bin/chrome/icons/default |
19 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(DIST)/bin/chrome/icons/default |
20 +endif |
20 +endif |
21 endif |
21 endif |
22 |
22 |
23 ifdef MOZ_SPLASHSCREEN |
23 libs:: $(srcdir)/profile/prefs.js |
24 ifeq ($(MOZ_WIDGET_TOOLKIT),windows) |
24 $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile |
25 libs:: |
25 |
26 $(INSTALL) $(IFLAGS1) $(DIST)/branding/splash.bmp $(DIST)/bin |
26 libs:: $(srcdir)/blocklist.xml |
27 endif |
27 $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin |
28 endif |
28 |
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 @@ -69,18 +69,21 @@ OSX_BRANDING_FILES = \ |
32 @@ -65,18 +65,21 @@ OSX_BRANDING_FILES = \ |
33 firefox.icns \ |
33 firefox.icns \ |
34 disk.icns \ |
34 disk.icns \ |
35 document.icns \ |
35 document.icns \ |
36 dsstore \ |
36 dsstore \ |
37 $(NULL) |
37 $(NULL) |
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 @@ -421,18 +421,21 @@ |
57 @@ -415,18 +415,21 @@ |
58 #ifdef SHIP_FEEDBACK |
58 #ifdef SHIP_FEEDBACK |
59 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
59 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
60 #endif |
60 #endif |
61 @BINPATH@/chrome/toolkit@JAREXT@ |
61 @BINPATH@/chrome/toolkit@JAREXT@ |
62 @BINPATH@/chrome/toolkit.manifest |
62 @BINPATH@/chrome/toolkit.manifest |