Changeset 18677 for gsdl/trunk

Timestamp:

2009-03-13T15:06:46+13:00 (15 years ago)

Author:

ak19

Message:

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

File:

• gsdl/trunk/Makefile.in (modified) (5 diffs)

gsdl/trunk/Makefile.in

@@ -71 +71 @@
 
 test-gsdlhome:
-    @ if test -z "$(GSDLHOME)" ; then \
+    @ if test -z "${GSDLHOME}" ; then \
       echo "" ; \
       echo "Environment variable GSDLHOME not set." ; \
@@ -86 +86 @@
 configure-cgi: test-gsdlhome
     @ echo "Configuring cgi-bin/gsdlsite.cfg" ;
-    sed "s@\*\*GSDLHOME\*\*@$(GSDLHOME)@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg ;
+    @ sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" cgi-bin/gsdlsite.cfg.in > cgi-bin/gsdlsite.cfg ;
 
 
@@ -107 +107 @@
           make web-stop-tested ; \
           echo "Setting config file to use port $$port"; \
-          cat "${GSDLHOME}/apache-httpd/conf/httpd.conf" \
-        | sed "s/^Listen [0-9]\+/Listen $$port/" \
-        > "${GSDLHOME}/apache-httpd/conf/httpd.conf.new" ; \
+          cat "${GSDLHOME}/apache-httpd/conf/httpd.conf.in" \
+        | sed "s@\*\*PORT\*\*@$$port@g" \
+        | sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" \
+        > "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; \
           echo "Type 'make web-start' to start the web server running on port $$port" ; \
         fi ; \
@@ -117 +118 @@
 MONITOR_FAILED="MAKE FAILED"
 MONITOR_FINISHED="MAKE DONE"
+
+configure-apache: test-gsdlhome
+    @ echo "Configuring the apache webserver..." ;
+    @ ( port=`egrep "^apache.port" lib/java/build.properties | awk -F= '{print $$2}'` ; \
+        echo $$port | make configure-port ; )
+    @ echo $(MONITOR_SUCCESS)
+    @ echo $(MONITOR_FINISHED)
+
+
+configure-web: configure-cgi configure-apache
 
 web-status: test-gsdlhome
@@ -141 +152 @@
     @# been done.  This avoids a unnecessary repetition of printing
     @# out the values of GSDLHOME and GSDLOS
-    ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop
+    @ if test -e "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; then \
+        ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop ; \
+    fi
     @ echo $(MONITOR_SUCCESS)
     @ echo $(MONITOR_FINISHED)