Bug 1185637 - part 2 - move DEFINES out of browser/installer/windows/Makefile.in; r=glandium

This commit is contained in:
Nathan Froyd 2015-07-20 14:40:24 -04:00
parent 535404b566
commit ba0aa27b84
2 changed files with 4 additions and 6 deletions

View File

@ -35,12 +35,6 @@ BRANDING_FILES = \
wizWatermark.bmp \
$(NULL)
DEFINES += \
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-DMOZ_APP_DISPLAYNAME='${MOZ_APP_DISPLAYNAME}' \
-DMOZILLA_VERSION=${MOZILLA_VERSION} \
$(NULL)
include $(topsrcdir)/config/config.mk
ifdef LOCALE_MERGEDIR

View File

@ -5,3 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEFINES['APP_VERSION'] = CONFIG['FIREFOX_VERSION']
DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME']
DEFINES['MOZ_APP_DISPLAYNAME'] = "'%s'" % CONFIG['MOZ_APP_DISPLAYNAME']
DEFINES['MOZILLA_VERSION'] = CONFIG['MOZILLA_VERSION']