Changeset 18756

Timestamp:

2009-03-23T17:02:17+13:00 (15 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:

• gsdl/trunk/GSI-Makefile (modified) (4 diffs)

gsdl/trunk/GSI-Makefile

@@ -40 +40 @@
 
 configure-cgi: test-gsdlhome
-    @ echo "Configuring cgi-bin/gsdlsite.cfg" ;
-    @ sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg ;
-
+    @ if test ! -e ${GSDLHOME}/cgi-bin/gsdlsite.cfg ; then \
+      echo "Configuring cgi-bin/gsdlsite.cfg" ; \
+      sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg ; \
+    else \
+      echo "WARNING: Nothing done for make configure-cgi." ; \
+      echo "   If you wish to regenerate the file " ; \
+      echo "   ${GSDLHOME}/cgi-bin/gsdlsite.cfg" ; \
+      echo "   from scratch, delete the existing file first." ; \
+    fi
 
 configure-admin: test-gsdlhome
@@ -64 +70 @@
           make -f GSI-Makefile web-stop-tested ; \
           echo "Setting config file to use port $$port"; \
-          cat "${GSDLHOME}/apache-httpd/conf/httpd.conf.in" \
+          cat "${GSDLHOME}/apache-httpd/${GSDLOS}/conf/httpd.conf.in" \
         | sed "s@\*\*PORT\*\*@$$port@g" \
         | sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" \
-        > "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; \
+        > "${GSDLHOME}/apache-httpd/${GSDLOS}/conf/httpd.conf" ; \
           if test -e Makefile ; then \
             echo "Type 'make web-start' to start the web server running on port $$port" ; \
@@ -86 +92 @@
     @ ( port=`egrep "^apache.port" ${GSDLHOME}/lib/java/build.properties | awk -F= '{print $$2}'` ; \
         echo $$port | make -f GSI-Makefile configure-port ; )
-    @ if test -e "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; then \
+    @ if test -e "${GSDLHOME}/apache-httpd/${GSDLOS}/conf/httpd.conf" ; then \
       echo $(MONITOR_SUCCESS); \
     else \
@@ -119 +125 @@
     @# been done.  This avoids a unnecessary repetition of printing
     @# out the values of GSDLHOME and GSDLOS
-    @ if test -e "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; then \
+    @ if test -e "${GSDLHOME}/apache-httpd/${GSDLOS}/conf/httpd.conf" ; then \
       ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop ; \
     fi