Ignore:
Timestamp:
03/23/09 17:02:17 (12 years ago)
Author:
ak19
Message:
  1. The make target configure-cgi does not overwrite gsdlsite.cfg if it has already been generated from the .in file and prints a message in this case. 2. apache's httpd.conf is now located in the OS-specific folder.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/GSI-Makefile

    r18735 r18756  
    4040
    4141configure-cgi: test-gsdlhome
    42     @ echo "Configuring cgi-bin/gsdlsite.cfg" ;
    43     @ sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg ;
    44 
     42    @ if test ! -e ${GSDLHOME}/cgi-bin/gsdlsite.cfg ; then \
     43      echo "Configuring cgi-bin/gsdlsite.cfg" ; \
     44      sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg ; \
     45    else \
     46      echo "WARNING: Nothing done for make configure-cgi." ; \
     47      echo "   If you wish to regenerate the file " ; \
     48      echo "   ${GSDLHOME}/cgi-bin/gsdlsite.cfg" ; \
     49      echo "   from scratch, delete the existing file first." ; \
     50    fi
    4551
    4652configure-admin: test-gsdlhome
     
    6470          make -f GSI-Makefile web-stop-tested ; \
    6571          echo "Setting config file to use port $$port"; \
    66           cat "${GSDLHOME}/apache-httpd/conf/httpd.conf.in" \
     72          cat "${GSDLHOME}/apache-httpd/${GSDLOS}/conf/httpd.conf.in" \
    6773        | sed "s@\*\*PORT\*\*@$$port@g" \
    6874        | sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" \
    69         > "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; \
     75        > "${GSDLHOME}/apache-httpd/${GSDLOS}/conf/httpd.conf" ; \
    7076          if test -e Makefile ; then \
    7177            echo "Type 'make web-start' to start the web server running on port $$port" ; \
     
    8692    @ ( port=`egrep "^apache.port" ${GSDLHOME}/lib/java/build.properties | awk -F= '{print $$2}'` ; \
    8793        echo $$port | make -f GSI-Makefile configure-port ; )
    88     @ if test -e "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; then \
     94    @ if test -e "${GSDLHOME}/apache-httpd/${GSDLOS}/conf/httpd.conf" ; then \
    8995      echo $(MONITOR_SUCCESS); \
    9096    else \
     
    119125    @# been done.  This avoids a unnecessary repetition of printing
    120126    @# out the values of GSDLHOME and GSDLOS
    121     @ if test -e "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; then \
     127    @ if test -e "${GSDLHOME}/apache-httpd/${GSDLOS}/conf/httpd.conf" ; then \
    122128      ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop ; \
    123129    fi
Note: See TracChangeset for help on using the changeset viewer.