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-libxul-sdk.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Wed, 11 Aug 2010 10:17:01 +0200
changeset 125 bfef1af1ee28
parent 91 38ffd1ff8094
child 153 46ee28dc7145
permissions -rw-r--r--
reenable shared nss stuff
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     1
 
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     2
 
--- a/browser/locales/Makefile.in
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     3
 
+++ b/browser/locales/Makefile.in
91
38ffd1ff8094 Reversioning to 2.0b/4.0b (no package name change yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1
diff changeset 
     4
 
@@ -178,20 +178,22 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS
38ffd1ff8094 Reversioning to 2.0b/4.0b (no package name change yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1
diff changeset 
     5
 
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
38ffd1ff8094 Reversioning to 2.0b/4.0b (no package name change yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1
diff changeset 
     6
38ffd1ff8094 Reversioning to 2.0b/4.0b (no package name change yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1
diff changeset 
     7
 
 install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
38ffd1ff8094 Reversioning to 2.0b/4.0b (no package name change yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1
diff changeset 
     8
 
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
38ffd1ff8094 Reversioning to 2.0b/4.0b (no package name change yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1
diff changeset 
     9
1
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    10
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    11
 
 libs-%:
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    12
 
 	$(NSINSTALL) -D $(DIST)/install
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    13
 
+ifndef LIBXUL_SDK
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    14
 
 	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    15
 
+	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    16
 
+endif
91
38ffd1ff8094 Reversioning to 2.0b/4.0b (no package name change yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1
diff changeset 
    17
 
 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
1
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    18
 
 	@$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    19
 
-	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    20
 
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
045edd78eceb Add missing files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    21
 
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
91
38ffd1ff8094 Reversioning to 2.0b/4.0b (no package name change yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1
diff changeset 
    22
38ffd1ff8094 Reversioning to 2.0b/4.0b (no package name change yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1
diff changeset 
    23
38ffd1ff8094 Reversioning to 2.0b/4.0b (no package name change yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1
diff changeset 
    24
 
 repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
38ffd1ff8094 Reversioning to 2.0b/4.0b (no package name change yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1
diff changeset 
    25
 
 repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
38ffd1ff8094 Reversioning to 2.0b/4.0b (no package name change yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1
diff changeset 
    26
 
 	@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
38ffd1ff8094 Reversioning to 2.0b/4.0b (no package name change yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1
diff changeset 
    27
 
 	$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
mozilla