Changeset 18706 for gsdl/trunk

Timestamp:

2009-03-18T14:16:42+13:00 (15 years ago)

Author:

ak19

Message:

Calls to 'make' now call 'make -f GSI-Makefile' instead, else this file does not work in the binary release, where the main Makefile is not included such that calls to 'make' go nowhere.

File:

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

gsdl/trunk/GSI-Makefile

@@ -60 +60 @@
           echo "Port: $$port" ; \
           echo "Stopping web server (if running)" ; \
-          make web-stop-tested ; \
+          make -f GSI-Makefile web-stop-tested ; \
           echo "Setting config file to use port $$port"; \
           cat "${GSDLHOME}/apache-httpd/conf/httpd.conf.in" \
@@ -79 +79 @@
     @ echo "Configuring the apache webserver..." ;
     @ ( port=`egrep "^apache.port" lib/java/build.properties | awk -F= '{print $$2}'` ; \
-        echo $$port | make configure-port ; )
+        echo $$port | make -f GSI-Makefile configure-port ; )
     @ echo $(MONITOR_SUCCESS)
     @ echo $(MONITOR_FINISHED)