--- trunk/esys2/mk	2005/03/04 07:12:47	115
+++ trunk/esys2/mk	2005/04/01 05:48:48	116
@@ -1,11 +1,18 @@
-#!/bin/env bash
-# $Id$
-# a brutal building script for esys
+#!/bin/bash
 
-export ESYS_ROOT=${ESYS_ROOT:=`pwd`}
+# $Id$
+# An explicit building script for esys
 
 MODULES="tools/CppUnitTest tools/mmio esysUtils escript finley"
 
+if [ "$1" == "clean" ];
+then
+	for module in $MODULES ; do \
+		(echo Cleaning: $module; cd $module; gmake clean) \
+	done
+        exit
+fi
+
 (cd escript/lib; if [ ! -e py_src ]; then mkdir py_src; fi)
 
 (cd escript/inc; if [ ! -e escript ]; then ln -s ../src escript; fi)
@@ -18,14 +25,6 @@
 (cd tools/mmio; if [ ! -e Makefile ]; then ln -s ./mmio.mk Makefile; fi)
 (cd tools/CppUnitTest; if [ ! -e Makefile ]; then ln -s ./CppUnitTest.mk Makefile; fi)
 
-if [ "$1" == "clean" ];
-then
-	for module in $MODULES ; do \
-		(echo Cleaning: $module; cd $module; gmake clean) \
-	done
-        exit
-fi
-
 for module in $MODULES ; do \
 	(echo Building: $module; cd $module; gmake) \
 done
@@ -38,4 +37,3 @@
 	(cd esys; if [ ! -e escriptcpp.so ]; then ln -s ../lib/libescriptcpp.so escriptcpp.so; fi)
 	(cd esys; if [ ! -e finleycpp.so ]; then ln -s ../lib/libfinleycpp.so finleycpp.so; fi)
 fi
-