--- projects/cms/source/server/configure	2001/03/14 22:15:10	1.10
+++ projects/cms/source/server/configure	2001/03/14 23:24:21	1.12
@@ -4,7 +4,7 @@
 # i-scream Distributed Centralised Monitoring System
 # Server configure script
 #
-# $Id: configure,v 1.10 2001/03/14 22:15:10 tdb Exp $
+# $Id: configure,v 1.12 2001/03/14 23:24:21 tdb Exp $
 #
 
 ## Config
@@ -17,7 +17,7 @@ WGETPARAM="-nv"
 WGET="/usr/local/bin/wget ${WGETPARAM}"
 
 # This should always be the same
-PWD=`pwd`
+SRCROOT=`pwd`
 
 ## Library check
 
@@ -32,7 +32,7 @@ for LIB in ${LIBRARIES}; do
         echo "  + ${LIB} found"; \
     else \
         echo "  - ${LIB} not found, fetching from ${HTTPSERVER}${LIB}"; \
-        /usr/local/bin/wget -nv ${HTTPSERVER}${LIB}; \
+        ${WGET} -nv ${HTTPSERVER}${LIB}; \
     fi
     
 done
@@ -45,16 +45,16 @@ if test -r "jacorb.properties"; then \
   echo "  + jacorb.properties found"; \
 else \
   echo "  - jacorb.properties not found, fetching from ${HTTPSERVER}jacorb.properties"; \
-  wget -nv ${HTTPSERVER}jacorb.properties; \
+  ${WGET} ${HTTPSERVER}jacorb.properties; \
 fi
 
 ## Write out the include file for the Makefile's
 
 echo "> Generating Makefile includes"
 echo "  + writing root of source tree"
-echo "SOURCEROOT=${PWD}" > ${PWD}/Config.inc
+echo "SOURCEROOT=${SRCROOT}" > ${SRCROOT}/Config.inc
 echo "  + writing include"
-echo "include \$(SOURCEROOT)/Config2.inc" >> ${PWD}/Config.inc
+echo "include \$(SOURCEROOT)/Config2.inc" >> ${SRCROOT}/Config.inc
 
 echo "> Configure Completed"