diff -u -r1.4 -r1.5
--- run-marlin.sh	17 Nov 2006 02:22:15 -0000	1.4
+++ run-marlin.sh	10 Aug 2007 20:25:51 -0000	1.5
@@ -1,7 +1,7 @@

 #!/bin/sh
 

-. setup-gsl.sh
-. setup-root.sh

+#. setup-gsl.sh
+#. setup-root.sh

 . setup-marlin.sh

-echo "running $MARLIN/bin/Marlin" ...

+echo "running $(which Marlin) ..."

 $MARLIN/bin/Marlin $@

diff -u -r1.4 -r1.5
--- setup-marlin.sh	2 Oct 2006 17:17:58 -0000	1.4
+++ setup-marlin.sh	10 Aug 2007 20:25:51 -0000	1.5
@@ -1,8 +1,12 @@

 #!/bin/sh
 

-#export MARLIN=$PRJ_DIST/MarlinReco/pro/Marlin
-export MARLIN=$PRJ_DIST/MarlinReco/head/Marlin

+#
+# $Id: setup-marlin.sh,v 1.5 2007/08/10 20:25:51 jeremy Exp $
+# Marlin setup script using ilcinstall software installation.
+#

-#cd $MARLIN
-#source env.sh
-#cd -

+export ILCSOFT=$PRJ_DIST/ilcsoft/head
+export MARLIN=$ILCSOFT/Marlin/HEAD
+source $MARLIN/env.sh
+export PATH=$MARLIN/bin:$PATH
+export LD_LIBRARY_PATH=$(ls -d $PRJ_DIST/ilcsoft/head/MySQL/*/lib/mysql):$LD_LIBRARY_PATH