handle the envvar file properly in install-bindist.sh

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92492 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/install-bindist.sh.in b/build/install-bindist.sh.in
index 661c1d2a6a2aaaf45ef53bf4c17c1fa4b5c175a4..ca7220313658bc02313c684f5ec0dfa26201f7d2 100755 (executable)
--- a/build/install-bindist.sh.in
+++ b/build/install-bindist.sh.in
@@ -82,7 +82,17 @@ lcopy bindist/include $SR/include 755 644
 lcopy bindist/icons $SR/icons 755 644
 lcopy bindist/manual $SR/manual 755 644
 lcopy bindist/cgi-bin $SR/cgi-bin 750 750
+if [ -f $SR/bin/envvars ]
+then
+  echo "[Preserving existing envvars settings.]"
+  cp -p $SR/bin/envvars ./envvars.orig
+fi
 lcopy bindist/bin $SR/bin 750 750
+if [ -f ./envvars.orig ]
+then
+  cp -p ./envvars.orig $SR/bin/envvars
+  rm ./envvars.orig
+fi
 lcopy bindist/lib $SR/lib 750 750
 if [ -d $SR/conf ]
 then