get closer to having apxs work from a binary distribution

we need to copy libtool and instdso.sh verbatim, and we
need to edit config_vars.mk and apxs

still broken: "httpd -l" as invoked by apxs can fail since
support libraries (apr, aprutil, etc.) are probably not
findable


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

1 files changed, 8 insertions, 3 deletions

diff --git a/build/install-bindist.sh.in b/build/install-bindist.sh.in
index 673c933a9c..b9f356cc70 100755
--- a/build/install-bindist.sh.in
+++ b/build/install-bindist.sh.in
@@ -73,6 +73,9 @@ echo "into directory $SR ..."
 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/man $SR/man 755 644
 if [ -d bindist/modules ]
 then
@@ -118,9 +121,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;\@prefix\@;$SR;" \
+	support/apxs.in > $SR/bin/apxs
+PRE=`grep "^prefix = " 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;^#!/.*;#!$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