From 75b10a7b6b37f071943021811dc3fc0cf265f035 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Fri, 2 Feb 2018 11:02:50 -0500
Subject: End FIREFOX_VERSION and use preprocessed values in bundled
 install.rdf files

---
 browser/confvars.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'browser/confvars.sh')

diff --git a/browser/confvars.sh b/browser/confvars.sh
index dabd06ea7..1bc9d1ad0 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -32,8 +32,8 @@ fi
 # Enable building ./signmar and running libmar signature tests
 MOZ_ENABLE_SIGNMAR=1
 
-MOZ_APP_VERSION=$FIREFOX_VERSION
-MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY
+MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
+MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt`
 MOZ_EXTENSIONS_DEFAULT=" gio"
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
 # MOZ_BRANDING_DIRECTORY is the default branding directory used when none is
-- 
cgit v1.2.3