Backed out changeset 7a41b018d35a (bug 732480)

This commit is contained in:
Geoff Lankow 2012-03-22 21:41:18 +13:00
parent ecbf4bbd3f
commit cca5541578
2 changed files with 0 additions and 6 deletions

View File

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

View File

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