Changeset 18728 for gsdl/trunk
- Timestamp:
- 2009-03-20T17:12:34+13:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/GSI-Makefile
r18726 r18728 61 61 echo "Stopping web server (if running)" ; \ 62 62 make -f GSI-Makefile web-stop-tested ; \ 63 server=`egrep "^apache.server" lib/java/build.properties | awk -F= '{print $$2}'` ; \ 64 echo "Setting config file to use port $$port and server $$server"; \ 63 echo "Setting config file to use port $$port"; \ 65 64 cat "${GSDLHOME}/apache-httpd/conf/httpd.conf.in" \ 66 65 | sed "s@\*\*PORT\*\*@$$port@g" \ 67 | sed "s@\*\*SERVERNAME\*\*@$$server@g" \68 66 | sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" \ 69 67 > "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; \ … … 84 82 configure-apache: test-gsdlhome 85 83 @ echo "Configuring the apache webserver..." ; 86 @ ( port=`egrep "^apache.port" lib/java/build.properties | awk -F= '{print $$2}'` ; \84 @ ( port=`egrep "^apache.port" ${GSDLHOME}/lib/java/build.properties | awk -F= '{print $$2}'` ; \ 87 85 echo $$port | make -f GSI-Makefile configure-port ; ) 88 @ echo $(MONITOR_SUCCESS) 86 @ if test -e "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; then \ 87 echo $(MONITOR_SUCCESS); \ 88 else \ 89 echo $(MONITOR_FAILED); \ 90 fi 89 91 @ echo $(MONITOR_FINISHED) 90 92 … … 118 120 ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop ; \ 119 121 fi 122 123 web-stop: test-gsdlhome web-stop-tested 120 124 @ echo $(MONITOR_SUCCESS) 121 125 @ echo $(MONITOR_FINISHED) 122 123 web-stop: test-gsdlhome web-stop-tested
Note:
See TracChangeset
for help on using the changeset viewer.