Bug 732480 - Don't build and package update-settings.ini when updater is disabled. r=khuey

This commit is contained in:
Mike Hommey 2012-03-22 08:01:03 +01:00
parent b52ac88eae
commit 96a89764f9
2 changed files with 6 additions and 0 deletions

View File

@ -99,7 +99,9 @@
@BINPATH@/@MOZ_APP_NAME@
#endif
@BINPATH@/application.ini
#ifdef MOZ_UPDATER
@BINPATH@/update-settings.ini
#endif
@BINPATH@/platform.ini
#ifndef XP_OS2
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@

View File

@ -69,8 +69,10 @@ ifdef MOZ_APP_BASENAME
DIST_FILES = application.ini
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
ifdef MOZ_UPDATER
DIST_FILES += update-settings.ini
endif
endif
ifdef LIBXUL_SDK
GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
@ -160,10 +162,12 @@ leaktest.py: leaktest.py.in
GARBAGE += leaktest.py
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
ifdef MOZ_UPDATER
update-settings.ini: update-settings.ini.in $(APP_INI_DEPS)
$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $< > $@
GARBAGE += update-settings.ini
endif
endif
ifdef MOZ_APP_BASENAME
application.ini: application.ini.in $(APP_INI_DEPS)