Changeset 18728

Show
Ignore:
Timestamp:
20.03.2009 17:12:34 (10 years ago)
Author:
ak19
Message:

1. Correction to the make target web-stop-tested which previously prevented the generation of the httpd.conf file upon make configure-web BUT ONLY when the Java code ran it. 2. Undid the changes made in the previous commit (to do with the SERVERNAME placeholder in httpd.conf.in)

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/GSI-Makefile

    r18726 r18728  
    6161          echo "Stopping web server (if running)" ; \ 
    6262          make -f GSI-Makefile web-stop-tested ; \ 
    63           server=`egrep "^apache.server" lib/java/build.properties | awk -F= '{print $$2}'` ; \ 
    64           echo "Setting config file to use port $$port and server $$server"; \ 
     63          echo "Setting config file to use port $$port"; \ 
    6564          cat "${GSDLHOME}/apache-httpd/conf/httpd.conf.in" \ 
    6665        | sed "s@\*\*PORT\*\*@$$port@g" \ 
    67             | sed "s@\*\*SERVERNAME\*\*@$$server@g" \ 
    6866        | sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" \ 
    6967        > "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; \ 
     
    8482configure-apache: test-gsdlhome 
    8583    @ echo "Configuring the apache webserver..." ; 
    86     @ ( port=`egrep "^apache.port" lib/java/build.properties | awk -F= '{print $$2}'` ; \ 
     84    @ ( port=`egrep "^apache.port" ${GSDLHOME}/lib/java/build.properties | awk -F= '{print $$2}'` ; \ 
    8785        echo $$port | make -f GSI-Makefile configure-port ; ) 
    88     @ echo $(MONITOR_SUCCESS) 
     86    @ if test -e "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; then \ 
     87      echo $(MONITOR_SUCCESS); \ 
     88    else \ 
     89      echo $(MONITOR_FAILED); \ 
     90    fi 
    8991    @ echo $(MONITOR_FINISHED) 
    9092 
     
    118120      ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop ; \ 
    119121    fi 
     122 
     123web-stop: test-gsdlhome web-stop-tested 
    120124    @ echo $(MONITOR_SUCCESS) 
    121125    @ echo $(MONITOR_FINISHED) 
    122  
    123 web-stop: test-gsdlhome web-stop-tested