diff options
| author | Jeff Trawick <trawick@apache.org> | 2002-06-03 20:06:26 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2002-06-03 20:06:26 +0200 |
| commit | 92dc4191fe4d5706b1c9e3bcbc88a862fd699250 (patch) | |
| tree | fb20d1b832cc42a7427e9dedb780e3a350e0ae9c /build/install-bindist.sh.in | |
| parent | fix a major snafu that broke binary builds (diff) | |
| download | apache2-92dc4191fe4d5706b1c9e3bcbc88a862fd699250.tar.xz apache2-92dc4191fe4d5706b1c9e3bcbc88a862fd699250.zip | |
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
Diffstat (limited to 'build/install-bindist.sh.in')
| -rwxr-xr-x | build/install-bindist.sh.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build/install-bindist.sh.in b/build/install-bindist.sh.in index b9f356cc70..9a2a9e7554 100755 --- 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 |