diff --git a/setup.csh b/setup.csh
index 83155fcf76c9e87bf4d5570f22f93515dd620284..d85dc0c84258aa4d1701582211ba660815733e9b 100644
--- a/setup.csh
+++ b/setup.csh
@@ -3,11 +3,12 @@
 set called=($_)
 if ("$called" != "") then
   set scriptdir=$called[2]
+  set MYDIR=`dirname $scriptdir`
+  set MYDIR=`cd $MYDIR && pwd`    # ensure absolute path
 else
-  set scriptdir=$0
+  set scriptdir=$1
+  set MYDIR=$scriptdir
 endif
-set MYDIR=`dirname $scriptdir`
-set MYDIR=`cd $MYDIR && pwd`    # ensure absolute path
 setenv ANALYZER $MYDIR/podd
 setenv HCANALYZER $MYDIR
 # Check if LD_LIBRARY_PATH is defined