permit multiline comments and strings in macros

[bpt/coccinelle.git] / env.sh

diff --git a/env.sh b/env.sh
index 8ecd651..05273a6 100644 (file)
--- a/env.sh
+++ b/env.sh
@@ -1,10 +1,10 @@
 # I put both stuff useful for the user and developer in this file. Could
-# separate and have a env-user.sh, env-compile.sh, env-developer.sh, 
+# separate and have a env-user.sh, env-compile.sh, env-developer.sh,
 # but it's not worth it.
 
 #!!!!You need to source me with "source env.sh" from the good directory!!!!
 
-# 14 Aug 2009 Try likely locations for support files
+# 14 Aug 2009 Try directory we were executed from
 
 if [ "$1" ] ; then
        DIR=$1
@@ -14,23 +14,13 @@ fi
 
 if [ ! -r $DIR/standard.iso ]
 then
-   if [ -r /usr/local/share/coccinelle/standard.iso ]
-   then
-      echo "standard.iso not found in '$DIR' using /usr/local/share/coccinelle"
-      DIR="/usr/local/share/coccinelle"
-   else
-# The following won't work with "source env.sh" under bash
-      if [ -r `dirname $0`/standard.iso ]
-      then
-         echo "standard.iso not found in '$DIR' using `dirname $0`"
-        DIR=`dirname $0`
-      fi
-   fi
+        echo "standard.iso not found in '$DIR' trying `dirname $0`"
+       DIR=`dirname $0`
 fi
 
 if [ ! -r $DIR/standard.iso ]
-    then echo "standard.iso not found in '$DIR'. 
-Give its directory as the first argument.
+    then echo "standard.iso not found in '$DIR'.
+  Give the coccinelle directory as the first argument.
 ";
 else
 
@@ -54,7 +44,9 @@ LD_LIBRARY_PATH=$COCCINELLE_HOME:$LD_LIBRARY_PATH ; export LD_LIBRARY_PATH
 
 # To find .py files like the one in python/coccib
 echo adding $COCCINELLE_HOME/python to PYTHONPATH
-PYTHONPATH=$COCCINELLE_HOME/python:PYTHONPATH  ; export PYTHONPATH
+PYTHONPATH=$COCCINELLE_HOME/python:$PYTHONPATH ; export PYTHONPATH
 
 fi
 
+export PATH=$COCCINELLE_HOME:$PATH
+