From 267e352bb51c7908a930c503299cb86586e74322 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 17 May 2004 21:07:10 +0000
Subject: [PATCH] Fix problem introduced by Win32 fix, do it properly.

---
 src/libCom/env/bldEnvData.pl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/libCom/env/bldEnvData.pl b/src/libCom/env/bldEnvData.pl
index 949cdf235..bcdc31d13 100644
--- a/src/libCom/env/bldEnvData.pl
+++ b/src/libCom/env/bldEnvData.pl
@@ -57,12 +57,11 @@ sub GetVars {
 		# Discard comments, carriage returns and trailing whitespace
 		next if m/^ \s* \#/x;
 		chomp;
-		if (m/^ \s* ([A-Za-z_]\w*) \s* = \s* (.*) \s* $/x) {
+		if (m/^ \s* ([A-Za-z_]\w*) \s* = \s* ( \S* | ".*" ) \s* $/x) {
 			my ($var, $val) = ($1, $2);
 			next unless $need_var{$var};
-			$val =~ s/^"(.*)"$/$1/x;
-			# Added chomp for win32 builds
-			$value{$var} = chomp($VAL);
+			$val =~ s/^"(.*)"$/$1/;
+			$value{$var} = $val;
 		}
 	}
 	close IN;