diff -r 5a0a6f0f69ab -r 38ffd1ff8094 firefox-libxul-sdk.patch --- a/firefox-libxul-sdk.patch Mon Jun 14 07:11:01 2010 +0200 +++ b/firefox-libxul-sdk.patch Thu Jul 01 08:23:11 2010 +0200 @@ -1,7 +1,12 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -192,9 +192,11 @@ endif +@@ -178,20 +178,22 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS + $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins + + install:: $(addsuffix .xml,$(SEARCH_PLUGINS)) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins + libs-%: $(NSINSTALL) -D $(DIST)/install @@ -9,8 +14,14 @@ @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 + @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 +endif + @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) tests AB_CD=$* + + + repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" + repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES) + @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." + $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export