diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index e24a2105208..e790b3a09c4 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -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@ diff --git a/build/Makefile.in b/build/Makefile.in index 2b9b252e12c..562a94b68b4 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -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)