Changeset 18826

Show
Ignore:
Timestamp:
27.03.2009 19:23:04 (10 years ago)
Author:
ak19
Message:

1. Rewrote the apache-for-dist target so that it is no longer dependent on being given GSDLHOME (for which source setup.bash would have to have been performed). 2. No longer gets the redundant apxs.in file from the apache-httpd folder, but gets the original one from the httpd-version folder's support folder nested inside apache-httpd, since they are identical. 3. Corrected references to makefile-variable GSDLOS, now uses appropriate round instead of curly brackets that are used for env variables.

Files:
1 modified

Legend:

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

    r18815 r18826  
    102102        done 
    103103ifeq ($(USE_APACHE_HTTPD), 1) 
    104     mkdir -p ../../apache-httpd/${GSDLOS}/conf 
    105     cp -f apache-httpd/httpd.conf.in ../../apache-httpd/${GSDLOS}/conf/. 
     104    mkdir -p ../../apache-httpd/$(GSDLOS)/conf 
     105    cp -f apache-httpd/httpd.conf.in ../../apache-httpd/$(GSDLOS)/conf/. 
    106106    mkdir -p ../../etc/logs-gsi 
    107107    cp -f ../../lib/java/build.properties.in ../../lib/java/build.properties  
     
    129129 
    130130apache-for-dist: 
    131     cp apache-httpd/apxs.in ${GSDLHOME}/apache-httpd/${GSDLOS}/apxs.in 
    132     cp apache-httpd/install-bindist.sh ${GSDLHOME}/apache-httpd/${GSDLOS}/install-bindist.sh 
    133     chmod 755 ${GSDLHOME}/apache-httpd/${GSDLOS}/install-bindist.sh 
    134     for one_file in apachectl envvars envvars-std; do \ 
    135       sed -e "s%${GSDLHOME}/apache-httpd/${GSDLOS}%*\*\APACHE_HOME_OS\*\*%" ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/$$one_file > ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/$$one_file.tmp ; \ 
    136       mv ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/$$one_file.tmp ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/$$one_file ; \ 
    137     done 
     131    ( httpddir=`cd ./apache-httpd/httpd* ; pwd` ; \ 
     132      cp $$httpddir/support/apxs.in ../../apache-httpd/$(GSDLOS)/apxs.in ; \ 
     133      cp apache-httpd/install-bindist.sh ../../apache-httpd/$(GSDLOS)/install-bindist.sh ; \ 
     134      chmod 755 ../../apache-httpd/$(GSDLOS)/install-bindist.sh ; \ 
     135      gsdldir=`cd ../.. ; pwd` ; \ 
     136      for one_file in apachectl envvars envvars-std; do \ 
     137        sed -e "s%$$gsdldir/apache-httpd/$(GSDLOS)%*\*\APACHE_HOME_OS\*\*%" ../../apache-httpd/$(GSDLOS)/bin/$$one_file > ../../apache-httpd/$(GSDLOS)/bin/$$one_file.tmp ; \ 
     138        mv ../../apache-httpd/$(GSDLOS)/bin/$$one_file.tmp ../../apache-httpd/$(GSDLOS)/bin/$$one_file ; \ 
     139      done ; )