httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/support envvars-std.in
Date Sat, 15 Dec 2001 21:50:19 GMT
trawick     01/12/15 13:50:19

  Modified:    build    binbuild.sh install-bindist.sh.in
               support  envvars-std.in
  Log:
  get binbuild to do the right thing with envvars (install/edit as
  appropriate)
  
  fix a problem in the load-library-path setting (wrong kind of
  quotes were used)
  
  Revision  Changes    Path
  1.32      +6 -4      httpd-2.0/build/binbuild.sh
  
  Index: binbuild.sh
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/binbuild.sh,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- binbuild.sh	2001/12/07 15:55:23	1.31
  +++ binbuild.sh	2001/12/15 21:50:19	1.32
  @@ -136,10 +136,12 @@
       bindist/conf/httpd-std.conf > bindist/conf/httpd.conf
   cp bindist/conf/httpd.conf bindist/conf/httpd-std.conf
   
  -sed -e "s%$BUILD_DIR%$DEFAULT_DIR%" \
  -    -e "s%^#binbuild %%" \
  -    bindist/bin/apachectl > bindist/bin/apachectl.tmp
  -mv bindist/bin/apachectl.tmp bindist/bin/apachectl
  +for one_file in apachectl envvars envvars-std; do
  +    sed -e "s%$BUILD_DIR%$DEFAULT_DIR%" \
  +        -e "s%^#binbuild %%" \
  +        bindist/bin/$one_file > bindist/bin/$one_file.tmp
  +    mv bindist/bin/$one_file.tmp bindist/bin/$one_file
  +done
   
   echo "Creating distribution archive and readme file..."
    
  
  
  
  1.5       +10 -1     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- install-bindist.sh.in	2001/12/15 18:15:52	1.4
  +++ install-bindist.sh.in	2001/12/15 21:50:19	1.5
  @@ -86,9 +86,12 @@
   then
     echo "[Preserving existing envvars settings.]"
     cp -p $SR/bin/envvars ./envvars.orig
  +  HAD_ENVVARS=yes
  +else
  +  HAD_ENVVARS=no
   fi
   lcopy bindist/bin $SR/bin 750 750
  -if [ -f ./envvars.orig ]
  +if [ $HAD_ENVVARS = yes ]
   then
     cp -p ./envvars.orig $SR/bin/envvars
     rm ./envvars.orig
  @@ -121,6 +124,12 @@
   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
  +sed -e "s%@default_dir@%$SR%" \
  +        bindist/bin/envvars-std > $SR/bin/envvars-std
  +if [ $HAD_ENVVARS = no ]
  +then
  +    cp -p $SR/bin/envvars-std $SR/bin/envvars
  +fi
    
   echo "Ready."
   echo " +--------------------------------------------------------+"
  
  
  
  1.2       +1 -1      httpd-2.0/support/envvars-std.in
  
  Index: envvars-std.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/envvars-std.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- envvars-std.in	2001/12/15 13:56:36	1.1
  +++ envvars-std.in	2001/12/15 21:50:19	1.2
  @@ -4,7 +4,7 @@
   #
   # the following lines are automatically uncommented for
   # binary builds
  -#binbuild @SHLIBPATH_VAR@='@prefix@/lib/:$@SHLIBPATH_VAR@'
  +#binbuild @SHLIBPATH_VAR@="@prefix@/lib/:$@SHLIBPATH_VAR@"
   #binbuild export @SHLIBPATH_VAR@
   #
   @OS_SPECIFIC_VARS@
  
  
  

Mime
View raw message