cvs commit: httpd-2.0/build install-bindist.sh.in

[tr...@apache.org]

trawick     2002/06/03 11:06:26

  Modified:    .        CHANGES
               build    install-bindist.sh.in
  Log:
  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.
  
  Revision  Changes    Path
  1.806     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.805
  retrieving revision 1.806
  diff -u -r1.805 -r1.806
  --- CHANGES	2 Jun 2002 08:54:04 -0000	1.805
  +++ CHANGES	3 Jun 2002 18:06:26 -0000	1.806
  @@ -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]
   
  
  
  
  1.8       +3 -4      httpd-2.0/build/install-bindist.sh.in
  
  Index: install-bindist.sh.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/install-bindist.sh.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- install-bindist.sh.in	26 Apr 2002 18:56:16 -0000	1.7
  +++ install-bindist.sh.in	3 Jun 2002 18:06:26 -0000	1.8
  @@ -74,8 +74,7 @@
   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 @@
    
   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