From: Jeff Trawick <trawick@apache.org>
Date: Wed, 15 May 2002 17:47:39 +0000 (+0000)
Subject: don't leave the shared library path variable commented out in envvars
X-Git-Tag: 2.0.37~386
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d880ad3a7f9de30a0ad92e4942594bf45d347ae3;p=thirdparty%2Fapache%2Fhttpd.git

don't leave the shared library path variable commented out in envvars
for non-binbuild...  OS/390 needs it set all the time


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

diff --git a/CHANGES b/CHANGES
index ebc4f586253..2d140ed8154 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.37
 
+  *) OS/390: LIBPATH no longer has to be manually uncommented in
+     envvars to get apachectl to set up httpd properly.  [Jeff Trawick]
+
   *) mod_isapi: All mod_isapi directives, excluding ISAPICacheFile,
      may now be specified to the <File/Directory > container, rather
      than by vhost.  [William Rowe]
diff --git a/build/binbuild.sh b/build/binbuild.sh
index 9e386fb7c5d..37bec536b59 100755
--- a/build/binbuild.sh
+++ b/build/binbuild.sh
@@ -139,7 +139,6 @@ cp bindist/conf/httpd.conf bindist/conf/httpd-std.conf
 
 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
diff --git a/support/envvars-std.in b/support/envvars-std.in
index 831d8733ebd..acdbb128889 100644
--- a/support/envvars-std.in
+++ b/support/envvars-std.in
@@ -2,9 +2,7 @@
 #
 # This file is generated from envvars-std.in
 #
-# the following lines are automatically uncommented for
-# binary builds
-#binbuild @SHLIBPATH_VAR@="@prefix@/lib/:$@SHLIBPATH_VAR@"
-#binbuild export @SHLIBPATH_VAR@
+@SHLIBPATH_VAR@="@exp_libdir:$@SHLIBPATH_VAR@"
+export @SHLIBPATH_VAR@
 #
 @OS_SPECIFIC_VARS@