equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent cb004c79ce12bac3db93e34909cc979f2eecab4b |
2 # Parent 9e165dc62d6ba0c3b2a82387a238fe5811acdc92 |
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 @@ -161,16 +161,21 @@ endif |
7 @@ -160,16 +160,21 @@ endif |
8 endif #} LIBXUL_SDK |
8 endif #} LIBXUL_SDK |
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 |
21 endif |
21 endif |
22 |
22 |
23 libs:: $(srcdir)/profile/prefs.js |
23 libs:: $(srcdir)/profile/prefs.js |
24 $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile |
24 $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile |
25 |
25 |
26 libs:: $(srcdir)/blocklist.xml |
26 # channel-prefs.js is handled separate from other prefs due to bug 756325 |
27 $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin |
27 libs:: $(srcdir)/profile/channel-prefs.js |
28 |
28 $(NSINSTALL) -D $(DIST)/bin/defaults/pref |
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 @@ -65,18 +65,21 @@ OSX_BRANDING_FILES = \ |
32 @@ -65,18 +65,21 @@ OSX_BRANDING_FILES = \ |
33 firefox.icns \ |
33 firefox.icns \ |
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 @@ -478,18 +478,21 @@ |
57 @@ -476,18 +476,21 @@ |
58 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png |
58 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png |
59 #ifdef SHIP_FEEDBACK |
59 #ifdef SHIP_FEEDBACK |
60 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
60 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
61 #endif |
61 #endif |
62 @BINPATH@/chrome/toolkit@JAREXT@ |
62 @BINPATH@/chrome/toolkit@JAREXT@ |