Changeset 18677 for gsdl


Ignore:
Timestamp:
03/13/09 15:06:46 (12 years ago)
Author:
ak19
Message:

Dr Bainbridge made some corrections and added the new targets configure-apache and configure-web.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/Makefile.in

    r18560 r18677  
    7171
    7272test-gsdlhome:
    73     @ if test -z "$(GSDLHOME)" ; then \
     73    @ if test -z "${GSDLHOME}" ; then \
    7474      echo "" ; \
    7575      echo "Environment variable GSDLHOME not set." ; \
     
    8686configure-cgi: test-gsdlhome
    8787    @ echo "Configuring cgi-bin/gsdlsite.cfg" ;
    88     sed "s@\*\*GSDLHOME\*\*@$(GSDLHOME)@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg ;
     88    @ sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg ;
    8989
    9090
     
    107107          make web-stop-tested ; \
    108108          echo "Setting config file to use port $$port"; \
    109           cat "${GSDLHOME}/apache-httpd/conf/httpd.conf" \
    110         | sed "s/^Listen [0-9]\+/Listen $$port/" \
    111         > "${GSDLHOME}/apache-httpd/conf/httpd.conf.new" ; \
     109          cat "${GSDLHOME}/apache-httpd/conf/httpd.conf.in" \
     110        | sed "s@\*\*PORT\*\*@$$port@g" \
     111        | sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" \
     112        > "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; \
    112113          echo "Type 'make web-start' to start the web server running on port $$port" ; \
    113114        fi ; \
     
    117118MONITOR_FAILED="MAKE FAILED"
    118119MONITOR_FINISHED="MAKE DONE"
     120
     121configure-apache: test-gsdlhome
     122    @ echo "Configuring the apache webserver..." ;
     123    @ ( port=`egrep "^apache.port" lib/java/build.properties | awk -F= '{print $$2}'` ; \
     124        echo $$port | make configure-port ; )
     125    @ echo $(MONITOR_SUCCESS)
     126    @ echo $(MONITOR_FINISHED)
     127
     128
     129configure-web: configure-cgi configure-apache
    119130
    120131web-status: test-gsdlhome
     
    141152    @# been done.  This avoids a unnecessary repetition of printing
    142153    @# out the values of GSDLHOME and GSDLOS
    143     ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop
     154    @ if test -e "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; then \
     155        ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop ; \
     156    fi
    144157    @ echo $(MONITOR_SUCCESS)
    145158    @ echo $(MONITOR_FINISHED)
Note: See TracChangeset for help on using the changeset viewer.