зеркало из https://github.com/mozilla/gecko-dev.git
Bug 339714 - submakefiles sucks
This commit is contained in:
Родитель
218045e9fd
Коммит
5a3c2b2eb5
|
@ -52,7 +52,10 @@ run_for_effects := $(shell if ! test -d $(DIST); then $(NSINSTALL) -D $(DIST); f
|
|||
_ABS_DIST := $(shell cd $(DIST) && pwd)
|
||||
|
||||
ifdef MOZ_BRANDING_DIRECTORY
|
||||
SUBMAKEFILES += $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile
|
||||
SUBMAKEFILES += \
|
||||
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
|
||||
$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
# This makefile uses variable overrides from the libs-% target to
|
||||
|
@ -168,7 +171,7 @@ include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
|
|||
include $(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/installer/windows/charset.mk
|
||||
|
||||
repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/install/sea/$(PKG_BASENAME).installer.exe
|
||||
repackage-win32-installer: $(WIN32_INSTALLER_IN)
|
||||
repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
|
||||
@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
|
||||
ifdef MOZ_BRANDING_DIRECTORY
|
||||
$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
|
||||
|
|
Загрузка…
Ссылка в новой задаче