Fix the binary build install script so that the build logic

created by "apxs -g" will work when the user has a binary
build.

We didn't copy enough of the build directory and we edited
the wrong version of config_vars.mk.

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

diff --git a/CHANGES b/CHANGES
index ed58d107dc9406d04b4bef05895734b59fd49ce9..e094e177debdd30ede8464fc1e6bbd73ba134069 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.37
 
+  *) Fix the binary build install script so that the build logic
+     created by "apxs -g" will work when the user has a binary
+     build.  [Jeff Trawick]
+
   *) Allow instdso.sh to work with full paths to the shared module.
      [Justin Erenkrantz]
 

diff --git a/build/install-bindist.sh.in b/build/install-bindist.sh.in
index b9f356cc70e3e05dc84415c9a2fe697af320aace..9a2a9e7554abecaf71777a15e1d3380260a43ac4 100755 (executable)
--- a/build/install-bindist.sh.in
+++ b/build/install-bindist.sh.in
@@ -74,8 +74,7 @@ lmkdir $SR 755
 lmkdir $SR/proxy 750
 lmkdir $SR/logs 755
 lmkdir $SR/build 755
-cp -p bindist/build/libtool $SR/build
-cp -p bindist/build/instdso.sh $SR/build
+lcopy bindist/build $SR/build 750 750
 lcopy bindist/man $SR/man 755 644
 if [ -d bindist/modules ]
 then
@@ -123,9 +122,9 @@ fi
  
 sed -e "s;^#!\@perlbin\@.*;#!$PERL;" -e "s;\@prefix\@;$SR;" \
        support/apxs.in > $SR/bin/apxs
-PRE=`grep "^prefix = " build/config_vars.mk`
+PRE=`grep "^prefix = " bindist/build/config_vars.mk`
 PRE=`echo $PRE | sed -e "s;prefix = ;;"`
-sed -e "s;$PRE;$SR;" build/config_vars.mk > $SR/build/config_vars.mk
+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