equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 8e4bf8e8a79138350231e03dc567d893f67b2a29 |
2 # Parent 7272ee3a4df832b885fec122f02d32f23dcc9cdb |
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 @@ -127,16 +127,21 @@ endif |
7 @@ -127,16 +127,21 @@ endif |
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 ifndef LIBXUL_SDK |
26 # channel-prefs.js is handled separate from other prefs due to bug 756325 |
27 # channel-prefs.js is handled separate from other prefs due to bug 756325 |
27 libs:: $(srcdir)/profile/channel-prefs.js |
28 libs:: $(srcdir)/profile/channel-prefs.js |
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 @@ -35,18 +35,21 @@ OSX_BRANDING_FILES = \ |
32 @@ -35,18 +35,21 @@ OSX_BRANDING_FILES = \ |
33 firefox.icns \ |
33 firefox.icns \ |