Bug 840146 - Don't try to install updater.png with --disable-updater. r=glandium
authorJan Beich <jbeich@tormail.org>
Mon, 11 Feb 2013 15:14:46 -0500
changeset 121525 ed3a6ed1dd2018e92216b9774fe3b64dbac6bb3c
parent 121524 9e3a4589e251469070da5e605d08a54f86973e48
child 121526 d4b4794bbeaf27e3ff2dad29d09c95b300f765e8
push id22772
push userryanvm@gmail.com
push dateMon, 11 Feb 2013 20:14:45 +0000
treeherdermozilla-inbound@ed3a6ed1dd20 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs840146
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 840146 - Don't try to install updater.png with --disable-updater. r=glandium
browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -561,20 +561,22 @@
 @BINPATH@/browser/chrome/icons/default/default48.png
 #endif
 
 ; shell icons
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
 ; shell icons
 @BINPATH@/browser/icons/*.png
+#ifdef MOZ_UPDATER
 ; updater icon
 @BINPATH@/icons/updater.png
 #endif
 #endif
+#endif
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 @BINPATH@/browser/@PREF_DIR@/firefox.js
 @BINPATH@/browser/@PREF_DIR@/firefox-branding.js
 @BINPATH@/greprefs.js
 @BINPATH@/defaults/autoconfig/platform.js
 @BINPATH@/defaults/autoconfig/prefcalls.js