From ad3aa1ee14567d64ba0eb71025a7ca76c799a2c2 Mon Sep 17 00:00:00 2001
From: Andrew Dunstan <andrew@dunslane.net>
Date: Mon, 4 Jul 2011 10:12:27 -0400
Subject: [PATCH] Back-patch Fix bat file quoting of %ENV from commit 19b7fac8.

---
 src/tools/msvc/builddoc.bat | 2 +-
 src/tools/msvc/install.bat  | 2 +-
 src/tools/msvc/pgbison.bat  | 2 +-
 src/tools/msvc/pgflex.bat   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tools/msvc/builddoc.bat b/src/tools/msvc/builddoc.bat
index 7268ae207f4..2bd9cc65f20 100755
--- a/src/tools/msvc/builddoc.bat
+++ b/src/tools/msvc/builddoc.bat
@@ -12,7 +12,7 @@ IF EXIST ..\msvc IF EXIST ..\..\..\src cd ..\..\..
 IF NOT EXIST doc\src\sgml\version.sgml goto noversion
 
 IF NOT EXIST src\tools\msvc\buildenv.pl goto nobuildenv
-perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
+perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %%ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
 CALL bldenv.bat
 del bldenv.bat
 :nobuildenv 
diff --git a/src/tools/msvc/install.bat b/src/tools/msvc/install.bat
index 043bc69158b..480fb51a34b 100644
--- a/src/tools/msvc/install.bat
+++ b/src/tools/msvc/install.bat
@@ -15,7 +15,7 @@ exit /b 1
 SETLOCAL
 
 IF NOT EXIST buildenv.pl goto nobuildenv
-perl -e "require 'buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
+perl -e "require 'buildenv.pl'; while(($k,$v) = each %%ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
 CALL bldenv.bat
 del bldenv.bat
 :nobuildenv 
diff --git a/src/tools/msvc/pgbison.bat b/src/tools/msvc/pgbison.bat
index 396bfb5b45b..142f754b8a4 100755
--- a/src/tools/msvc/pgbison.bat
+++ b/src/tools/msvc/pgbison.bat
@@ -2,7 +2,7 @@
 REM $PostgreSQL: pgsql/src/tools/msvc/pgbison.bat,v 1.8 2007/12/19 12:29:36 mha Exp $
 
 IF NOT EXIST src\tools\msvc\buildenv.pl goto nobuildenv
-perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
+perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %%ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
 CALL bldenv.bat
 del bldenv.bat
 :nobuildenv 
diff --git a/src/tools/msvc/pgflex.bat b/src/tools/msvc/pgflex.bat
index f7427117e34..8a6067e4b07 100755
--- a/src/tools/msvc/pgflex.bat
+++ b/src/tools/msvc/pgflex.bat
@@ -2,7 +2,7 @@
 REM $PostgreSQL: pgsql/src/tools/msvc/pgflex.bat,v 1.5 2007/12/19 12:29:36 mha Exp $
 
 IF NOT EXIST src\tools\msvc\buildenv.pl goto nobuildenv
-perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
+perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %%ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
 CALL bldenv.bat
 del bldenv.bat
 :nobuildenv