Commit f6a3e3c1 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent 8a15caa1

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
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]










































build/install-bindist.sh.in



+3
−4



























Changes for build/install-bindist.sh.in: 3 added lines, 4 removed lines.



Original line number
Diff line number
Diff line







@@ -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