Changeset 18706

Show
Ignore:
Timestamp:
18.03.2009 14:16:42 (10 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/GSI-Makefile

    r18697 r18706  
    6060          echo "Port: $$port" ; \ 
    6161          echo "Stopping web server (if running)" ; \ 
    62           make web-stop-tested ; \ 
     62          make -f GSI-Makefile web-stop-tested ; \ 
    6363          echo "Setting config file to use port $$port"; \ 
    6464          cat "${GSDLHOME}/apache-httpd/conf/httpd.conf.in" \ 
     
    7979    @ echo "Configuring the apache webserver..." ; 
    8080    @ ( port=`egrep "^apache.port" lib/java/build.properties | awk -F= '{print $$2}'` ; \ 
    81         echo $$port | make configure-port ; ) 
     81        echo $$port | make -f GSI-Makefile configure-port ; ) 
    8282    @ echo $(MONITOR_SUCCESS) 
    8383    @ echo $(MONITOR_FINISHED)