get binbuild to do the right thing with envvars (install/edit as

appropriate)

fix a problem in the load-library-path setting (wrong kind of
quotes were used)

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

diff --git a/build/binbuild.sh b/build/binbuild.sh
index ddcafbf8c82083adab8e78f94affc716d7d7444e..bbd5058310cab47c2ce4e285e3da0e87e5a20576 100755 (executable)
--- a/build/binbuild.sh
+++ b/build/binbuild.sh
@@ -136,10 +136,12 @@ sed -e "s%$BUILD_DIR%$DEFAULT_DIR%" \
     bindist/conf/httpd-std.conf > bindist/conf/httpd.conf
 cp bindist/conf/httpd.conf bindist/conf/httpd-std.conf
 
-sed -e "s%$BUILD_DIR%$DEFAULT_DIR%" \
-    -e "s%^#binbuild %%" \
-    bindist/bin/apachectl > bindist/bin/apachectl.tmp
-mv bindist/bin/apachectl.tmp bindist/bin/apachectl
+for one_file in apachectl envvars envvars-std; do
+    sed -e "s%$BUILD_DIR%$DEFAULT_DIR%" \
+        -e "s%^#binbuild %%" \
+        bindist/bin/$one_file > bindist/bin/$one_file.tmp
+    mv bindist/bin/$one_file.tmp bindist/bin/$one_file
+done
 
 echo "Creating distribution archive and readme file..."
  

diff --git a/build/install-bindist.sh.in b/build/install-bindist.sh.in
index ca7220313658bc02313c684f5ec0dfa26201f7d2..38e8f1847d5375dcbe95874adacac73643bb9956 100755 (executable)
--- a/build/install-bindist.sh.in
+++ b/build/install-bindist.sh.in
@@ -86,9 +86,12 @@ if [ -f $SR/bin/envvars ]
 then
   echo "[Preserving existing envvars settings.]"
   cp -p $SR/bin/envvars ./envvars.orig
+  HAD_ENVVARS=yes
+else
+  HAD_ENVVARS=no
 fi
 lcopy bindist/bin $SR/bin 750 750
-if [ -f ./envvars.orig ]
+if [ $HAD_ENVVARS = yes ]
 then
   cp -p ./envvars.orig $SR/bin/envvars
   rm ./envvars.orig
@@ -121,6 +124,12 @@ sed -e "s;^#!/.*;#!$PERL;" -e "s;\@prefix\@;$SR;" -e "s;\@sbindir\@;$SR/bin;" \
 sed -e "s;^#!/.*;#!$PERL;" bindist/bin/dbmmanage > $SR/bin/dbmmanage
 sed -e "s%@default_dir@%$SR%" \
         -e "s%^HTTPD=.*$%HTTPD=\"$SR/bin/httpd -d $SR\"%" bindist/bin/apachectl > $SR/bin/apachectl
+sed -e "s%@default_dir@%$SR%" \
+        bindist/bin/envvars-std > $SR/bin/envvars-std
+if [ $HAD_ENVVARS = no ]
+then
+    cp -p $SR/bin/envvars-std $SR/bin/envvars
+fi
  
 echo "Ready."
 echo " +--------------------------------------------------------+"

diff --git a/support/envvars-std.in b/support/envvars-std.in
index 37a860627830cf16054094d53f84d96dc7266430..831d8733ebd1cb9aa5a097ad02ba49908204d317 100644 (file)
--- a/support/envvars-std.in
+++ b/support/envvars-std.in
@@ -4,7 +4,7 @@
 #
 # the following lines are automatically uncommented for
 # binary builds
-#binbuild @SHLIBPATH_VAR@='@prefix@/lib/:$@SHLIBPATH_VAR@'
+#binbuild @SHLIBPATH_VAR@="@prefix@/lib/:$@SHLIBPATH_VAR@"
 #binbuild export @SHLIBPATH_VAR@
 #
 @OS_SPECIFIC_VARS@