Merge the AP_OPENSSL_USE_ERRNO_THREADID check to trunk for wider testing

[apache] / build / install-bindist.sh.in

diff --git a/build/install-bindist.sh.in b/build/install-bindist.sh.in
index 673c933a9c68566948bc1a4745c617304dcff98a..f304ac7c8088e75647ce89e141ce42a05e920e5a 100755 (executable)
--- a/build/install-bindist.sh.in
+++ b/build/install-bindist.sh.in
@@ -1,5 +1,21 @@
 #!/bin/sh
 #
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
 # Usage: install-bindist.sh [ServerRoot]
 # This script installs the Apache binary distribution and
 # was automatically created by binbuild.sh.
@@ -50,16 +66,21 @@ lcopy()
 PERL=no-perl5-on-this-system
 perls='perl5 perl'
 path=`echo $PATH | sed -e 's/:/ /g'`
+found_perl=0
  
 for dir in ${path} ;  do
   for pperl in ${perls} ; do
     if test -f "${dir}/${pperl}" ; then
-      if `${dir}/${pperl} -v | grep 'version 5\.' >/dev/null 2>&1` ; then
+      if `${dir}/${pperl} -v >/dev/null 2>&1` ; then
         PERL="${dir}/${pperl}"
+        found_perl=1
         break
       fi
     fi
   done
+  if test $found_perl = 1 ; then
+    break
+  fi
 done
  
 if [ .$1 = . ]
@@ -73,6 +94,8 @@ echo "into directory $SR ..."
 lmkdir $SR 755
 lmkdir $SR/proxy 750
 lmkdir $SR/logs 755
+lmkdir $SR/build 755
+lcopy bindist/build $SR/build 750 750
 lcopy bindist/man $SR/man 755 644
 if [ -d bindist/modules ]
 then
@@ -118,9 +141,11 @@ else
   lcopy bindist/error $SR/error 755 644
 fi
  
-sed -e "s;^#!/.*;#!$PERL;" -e "s;\@prefix\@;$SR;" -e "s;\@sbindir\@;$SR/bin;" \
-       -e "s;\@libexecdir\@;$SR/libexec;" -e "s;\@includedir\@;$SR/include;" \
-       -e "s;\@sysconfdir\@;$SR/conf;" bindist/bin/apxs > $SR/bin/apxs
+sed -e "s;^#!\@perlbin\@.*;#!$PERL;" -e "s;\@exp_installbuilddir\@;$SR/build;" \
+       support/apxs.in > $SR/bin/apxs
+PRE=`grep "^prefix = " bindist/build/config_vars.mk`
+PRE=`echo $PRE | sed -e "s;prefix = ;;"`
+sed -e "s;$PRE;$SR;" bindist/build/config_vars.mk > $SR/build/config_vars.mk
 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