1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 6e05daaf579aa134cadb3e42451c1918409d18c3 |
2 # Parent aae1343996e42d97b8d19e41d19b5d31b5465af0 |
3 |
3 |
4 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in |
|
5 --- a/browser/locales/Makefile.in |
|
6 +++ b/browser/locales/Makefile.in |
|
7 @@ -180,20 +180,18 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS |
|
8 $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins |
|
9 |
|
10 install:: $(addsuffix .xml,$(SEARCH_PLUGINS)) |
|
11 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins |
|
12 |
|
13 |
|
14 libs-%: |
|
15 $(NSINSTALL) -D $(DIST)/install |
|
16 -ifndef LIBXUL_SDK |
|
17 @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 |
|
18 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
|
19 -endif |
|
20 ifdef MOZ_SERVICES_SYNC |
|
21 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
|
22 endif |
|
23 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 |
|
24 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
|
25 |
|
26 |
|
27 repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" |
|
28 diff --git a/browser/makefiles.sh b/browser/makefiles.sh |
4 diff --git a/browser/makefiles.sh b/browser/makefiles.sh |
29 --- a/browser/makefiles.sh |
5 --- a/browser/makefiles.sh |
30 +++ b/browser/makefiles.sh |
6 +++ b/browser/makefiles.sh |
31 @@ -74,16 +74,21 @@ browser/installer/windows/Makefile |
7 @@ -74,16 +74,21 @@ browser/installer/windows/Makefile |
32 browser/locales/Makefile |
8 browser/locales/Makefile |