Show
Ignore:
Timestamp:
03.05.2011 19:09:14 (9 years ago)
Author:
ak19
Message:

install-bindist.sh now works with template .in files to parallel the changes to the apache-for-dist target in the Makefile compiling apache. Added a file for processing into the Makefile.

Location:
main/trunk/greenstone2/runtime-src/packages
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/packages/Makefile.in

    r23935 r23981  
    9595    build/config.nice \ 
    9696    build/apr_rules.mk \ 
     97    bin/dbmmanage \ 
    9798    bin/apu-1-config \ 
    9899    bin/apr-1-config \ 
  • main/trunk/greenstone2/runtime-src/packages/apache-httpd/install-bindist.sh

    r23976 r23981  
    7878#PRE=`grep "^prefix = " build/config_vars.mk` 
    7979#PRE=`echo $PRE | sed -e "s;prefix = ;;"` 
    80 sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" build/config_vars.mk > "$SR/build/config_vars.mk.tmp" 
     80sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" build/config_vars.mk.in > "$SR/build/config_vars.mk.tmp" 
    8181mv "$SR/build/config_vars.mk.tmp" "$SR/build/config_vars.mk" 
    8282chmod u+rwx "$SR/build/config_vars.mk" 
    8383 
    84 sed -e "s;^#!/.*;#!$PERL;" bin/dbmmanage > "$SR/bin/dbmmanage.tmp" 
     84sed -e "s;^#!/.*;#!$PERL;" bin/dbmmanage.in > "$SR/bin/dbmmanage.tmp" 
    8585mv "$SR/bin/dbmmanage.tmp" "$SR/bin/dbmmanage" 
    8686 
    8787# IMPORTANT: need to insert the ServerRoot nested inside quotes into the apachectl file 
     88#cp bin/apachectl.in bin/apachectl 
    8889sed -e "s%\*\*APACHE_HOME_OS\*\*%\"$SR\"%" \ 
    8990    -e "s%^HTTPD=.*$%HTTPD=\"$SR/bin/httpd\"%" \ 
    90     -e "s%\$HTTPD%\"\$HTTPD\" -d \"$SR\"%" bin/apachectl > "$SR/bin/apachectl.tmp" 
     91    -e "s%\$HTTPD%\"\$HTTPD\" -d \"$SR\"%" bin/apachectl.in > "$SR/bin/apachectl.tmp" 
    9192mv "$SR/bin/apachectl.tmp" "$SR/bin/apachectl" 
    9293chmod u+rwx "$SR/bin/apachectl" 
    9394 
    9495sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" \ 
    95         bin/envvars-std > "$SR/bin/envvars-std.tmp" 
     96        bin/envvars-std.in > "$SR/bin/envvars-std.tmp" 
    9697mv "$SR/bin/envvars-std.tmp" "$SR/bin/envvars-std" 
    9798chmod u+rwx "$SR/bin/envvars-std" 
     
    99100if [ $HAD_ENVVARS = no ] 
    100101then 
    101     cp -p "$SR/bin/envvars-std" "$SR/bin/envvars" 
     102    cp -p "$SR/bin/envvars-std" "$SR/bin/envvars.in" 
    102103fi 
    103104# Either way, do a find and replace on APACHE_HOME_OS in the envvars file 
    104 sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/bin/envvars" > "$SR/bin/envvars.tmp" 
     105sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$SR/bin/envvars.in" > "$SR/bin/envvars.tmp" 
    105106mv "$SR/bin/envvars.tmp" "$SR/bin/envvars" 
    106107 
     
    112113for one_file in $REPLACELIST; do 
    113114    if [ -f $one_file ]; then 
    114         sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$one_file" > "$one_file.tmp" 
     115        sed -e "s%\*\*APACHE_HOME_OS\*\*%$SR%" "$one_file.in" > "$one_file.tmp" 
    115116        mv $one_file.tmp $one_file 
    116117        chmod u+w $one_file