firefox-libxul-sdk.patch
changeset 91 38ffd1ff8094
parent 1 045edd78eceb
child 153 46ee28dc7145
equal deleted inserted replaced
87:5a0a6f0f69ab 91:38ffd1ff8094
     1 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
     1 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
     2 --- a/browser/locales/Makefile.in
     2 --- a/browser/locales/Makefile.in
     3 +++ b/browser/locales/Makefile.in
     3 +++ b/browser/locales/Makefile.in
     4 @@ -192,9 +192,11 @@ endif
     4 @@ -178,20 +178,22 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS
       
     5  	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
       
     6  
       
     7  install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
       
     8  	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
       
     9  
     5  
    10  
     6  libs-%:
    11  libs-%:
     7  	$(NSINSTALL) -D $(DIST)/install
    12  	$(NSINSTALL) -D $(DIST)/install
     8 +ifndef LIBXUL_SDK
    13 +ifndef LIBXUL_SDK
     9  	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
    14  	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
    10 +	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
    15 +	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
    11 +endif
    16 +endif
       
    17  	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
    12  	@$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
    18  	@$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
    13 -	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
    19 -	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
    14  	@$(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
    15  	@$(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
    16  	@$(MAKE) tests AB_CD=$*
    22  
       
    23  
       
    24  repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
       
    25  repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
       
    26  	@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
       
    27  	$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export