1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent c0749d2284c555e499beef7a8ae08d37abe45fcd |
2 # Parent e386d64898cac5a2e10bc4fbce606ffeefe1f210 |
3 |
3 |
4 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in |
4 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in |
5 --- a/browser/locales/Makefile.in |
5 --- a/browser/locales/Makefile.in |
6 +++ b/browser/locales/Makefile.in |
6 +++ b/browser/locales/Makefile.in |
7 @@ -184,17 +184,19 @@ install:: $(addsuffix .xml,$(SEARCH_PLUG |
7 @@ -181,17 +181,19 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS |
|
8 |
|
9 install:: $(addsuffix .xml,$(SEARCH_PLUGINS)) |
|
10 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins |
8 |
11 |
9 |
12 |
10 libs-%: |
13 libs-%: |
11 $(NSINSTALL) -D $(DIST)/install |
14 $(NSINSTALL) -D $(DIST)/install |
12 ifndef LIBXUL_SDK |
|
13 @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 |
15 @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 |
14 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
|
15 endif |
|
16 +ifdef MOZ_SERVICES_SYNC |
16 +ifdef MOZ_SERVICES_SYNC |
17 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
17 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
18 +endif |
18 +endif |
|
19 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
19 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 |
20 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 |
20 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
21 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
21 |
22 |
22 |
23 |
23 repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" |
24 repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" |
24 repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES) |
25 repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES) |
25 @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." |
26 @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." |
26 $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export |
|