Bug 1319351 - Avoid splash.rc depending on files in dist/branding. r?mshal
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -85,10 +85,10 @@ if CONFIG['HAVE_CLOCK_MONOTONIC']:
if CONFIG['MOZ_GPSD']:
DEFINES['MOZ_GPSD'] = True
if CONFIG['MOZ_LINUX_32_SSE2_STARTUP_ERROR']:
DEFINES['MOZ_LINUX_32_SSE2_STARTUP_ERROR'] = True
for icon in ('firefox', 'document', 'newwindow', 'newtab', 'pbmode'):
- DEFINES[icon.upper() + '_ICO'] = '"%s/dist/branding/%s.ico"' % (
- TOPOBJDIR, icon)
+ DEFINES[icon.upper() + '_ICO'] = '"%s/%s/%s.ico"' % (
+ TOPOBJDIR, CONFIG['MOZ_BRANDING_DIRECTORY'], icon)