Mercurial Mercurial > hg > mozilla / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
firefox-no-sync-l10n.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Wed, 11 Aug 2010 12:17:17 +0200
changeset 126 7b356805729c
parent 101 1678af7b5183
child 153 46ee28dc7145
permissions -rw-r--r--
remove the 4 suffix (no parallel installation starting with beta4)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
101
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     1
 
# HG changeset patch
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     2
 
# Parent 96eedd7737acfc529a441ca0cedd4c06fa737219
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     3
 
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     4
 
--- a/browser/locales/Makefile.in
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     5
 
+++ b/browser/locales/Makefile.in
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     6
 
@@ -182,17 +182,19 @@ install:: $(addsuffix .xml,$(SEARCH_PLUG
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     7
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     8
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     9
 
 libs-%:
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    10
 
 	$(NSINSTALL) -D $(DIST)/install
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    11
 
 ifndef LIBXUL_SDK
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    12
 
 	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    13
 
 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    14
 
 endif
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    15
 
+ifdef MOZ_SERVICES_SYNC
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    16
 
 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    17
 
+endif
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    18
 
 	@$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    19
 
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    20
 
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    21
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    22
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    23
 
 repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    24
 
 repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
1678af7b5183 Fix l10n build of Firefox
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    25
 
 	@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
mozilla