Coccinelle release 1.0.0-rc13

[bpt/coccinelle.git] / scripts / spatch.sh.in

diff --git a/scripts/spatch.sh.in b/scripts/spatch.sh.in
index ea47a12..a555352 100644 (file)
--- a/scripts/spatch.sh.in
+++ b/scripts/spatch.sh.in
@@ -1,12 +1,16 @@
-#!/bin/sh -e
+#! /bin/sh -e
 
 # generic wrapper script to invoke 'spatch' or 'spatch.opt'
 # it sets the python variables (if relevant)
-# and OCCINELLE_HOME
+# and COCCINELLE_HOME
 
 SHAREDIR="@prefix@/share/coccinelle"
 LIBDIR="@prefix@/lib"
 
+if test ! -d "$SHAREDIR"; then
+    SHAREDIR="$(pwd)"
+fi
+
 COCCINELLE_HOME="${COCCINELLE_HOME:=$SHAREDIR}"
 #echo setting COCCINELLE_HOME=${COCCINELLE_HOME:=$SHAREDIR}
 
@@ -16,12 +20,12 @@ fi
 
 if [ ! -r "${COCCINELLE_HOME}/standard.iso" ] ; then
   echo "There is no standard.iso in ${COCCINELLE_HOME}." 1>&2
-  echo "Are you sure you run a properly installed version of spatch ?\n" 1>&2
+  echo -n "Are you sure you run a properly installed version of spatch ?\n" 1>&2
 else
 
 export COCCINELLE_HOME
 
-export LD_LIBRARY_PATH="${LIBDIR}:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="${LIBDIR}:$LD_LIBRARY_PATH:${SHAREDIR}:${COCCINELLE_HOME}"
 export PYTHONPATH="${COCCINELLE_HOME}/python:$PYTHONPATH"
 
 # echo setting LD_LIBRARY_PATH="$LD_LIBRARY_PATH"