Commit adc340fe authored by Geoff Lankow's avatar Geoff Lankow
Browse files

Backed out changeset 7a41b018d35a (bug 732480)

parent 3dd66596
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -99,9 +99,7 @@
@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@
+0 −4
Original line number Diff line number Diff line
@@ -69,10 +69,8 @@ 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)
@@ -162,12 +160,10 @@ 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)