diff --git a/LCS/Tools/src/lofarinit.csh b/LCS/Tools/src/lofarinit.csh index bd78833050e21527e1770e2ce364aae753c26977..5153ac224d2a38bfba8c7e5f719b4878c2f7f4e1 100644 --- a/LCS/Tools/src/lofarinit.csh +++ b/LCS/Tools/src/lofarinit.csh @@ -28,21 +28,21 @@ # The actual value is filled in by make install (see Makefile.am). set a_root = . #filled in by install -# First strip the current LOFARPATH from PATH and LD_LIBRARY_PATH +# First strip the current LOFARROOT from PATH and LD_LIBRARY_PATH # Take care that a possible . is preceeded by a backslash. -if (! $?LOFARPATH) then - set a_path = `echo $LOFARPATH | sed -e 's/\./\\\./g'` +if (! $?LOFARROOT) then + set a_path = `echo $LOFARROOT | sed -e 's/\./\\\./g'` set a_bin = "$a_path/bin" setenv PATH `echo $PATH | sed -e "s%:${a_bin}:%:%g" -e "s%^${a_bin}:%%" -e "s%:${a_bin}"'$%%' -e "s%^${a_bin}"'$%%'` set a_lib = "$a_path/lib" setenv LD_LIBRARY_PATH `echo $LD_LIBRARY_PATH | sed -e "s%:${a_lib}:%:%g" -e "s%^${a_lib}:%%" -e "s%:${a_lib}"'$%%' -e "s%^${a_lib}"'$%%'` endif -# Now define the new LOFARPATH -setenv LOFARPATH `cd $a_root; pwd` # make path absolute +# Now define the new LOFARROOT +setenv LOFARROOT `cd $a_root; pwd` # make path absolute # Also strip this path from the current paths (in case it is contained in it). -set a_path = `echo $LOFARPATH | sed -e 's/\./\\\./g'` +set a_path = `echo $LOFARROOT | sed -e 's/\./\\\./g'` set a_bin = "$a_path/bin" setenv PATH `echo $PATH | sed -e "s%:${a_bin}:%:%g" -e "s%^${a_bin}:%%" -e "s%:${a_bin}"'$%%' -e "s%^${a_bin}"'$%%'` set a_lib = "$a_path/lib" @@ -50,12 +50,12 @@ setenv LD_LIBRARY_PATH `echo $LD_LIBRARY_PATH | sed -e "s%:${a_lib}:%:%g" -e "s% # Add the path to the standard paths. if (! $?PATH) then - setenv PATH $LOFARPATH/bin + setenv PATH $LOFARROOT/bin else - setenv PATH $LOFARPATH/bin:$PATH + setenv PATH $LOFARROOT/bin:$PATH endif if (! $?LD_LIBRARY_PATH) then - setenv LD_LIBRARY_PATH $LOFARPATH/lib + setenv LD_LIBRARY_PATH $LOFARROOT/lib else - setenv LD_LIBRARY_PATH $LOFARPATH/lib:$LD_LIBRARY_PATH + setenv LD_LIBRARY_PATH $LOFARROOT/lib:$LD_LIBRARY_PATH endif diff --git a/LCS/Tools/src/lofarinit.sh b/LCS/Tools/src/lofarinit.sh index 58e663b106ff5830400256cc3e5518f54cd389e3..143043c7fe2b5de34679545c1852c4513e4d23c4 100644 --- a/LCS/Tools/src/lofarinit.sh +++ b/LCS/Tools/src/lofarinit.sh @@ -28,10 +28,10 @@ # The actual value is filled in by make install (see Makefile.am). a_root=. #filled in by install -# First strip the current LOFARPATH from PATH and LD_LIBRARY_PATH +# First strip the current LOFARROOT from PATH and LD_LIBRARY_PATH # Take care that a possible . is preceeded by a backslash. -if [ "$LOFARPATH" != "" ]; then - a_path=`echo $LOFARPATH | sed -e 's/\./\\\./g'` +if [ "$LOFARROOT" != "" ]; then + a_path=`echo $LOFARROOT | sed -e 's/\./\\\./g'` a_bin="$a_path/bin" PATH=`echo $PATH | sed -e "s%:$a_bin:%:%g" -e "s%^$a_bin:%%" -e "s%:$a_bin$%%" -e "s%^$a_bin$%%"` export PATH @@ -40,12 +40,12 @@ if [ "$LOFARPATH" != "" ]; then export LD_LIBRARY_PATH fi -# Now define the new LOFARPATH -LOFARPATH=`cd $a_root; pwd` # make path absolute -export LOFARPATH +# Now define the new LOFARROOT +LOFARROOT=`cd $a_root; pwd` # make path absolute +export LOFARROOT # Also strip this path from the current paths (in case it is contained in it). -a_path=`echo $LOFARPATH | sed -e 's/\./\\\./g'` +a_path=`echo $LOFARROOT | sed -e 's/\./\\\./g'` a_bin="$a_path/bin" PATH=`echo $PATH | sed -e "s%:$a_bin:%:%g" -e "s%^$a_bin:%%" -e "s%:$a_bin$%%" -e "s%^$a_bin$%%"` export PATH @@ -55,14 +55,14 @@ export LD_LIBRARY_PATH # Add the path to the standard paths. if [ "$PATH" = "" ]; then - PATH=$LOFARPATH/bin + PATH=$LOFARROOT/bin else - PATH=$LOFARPATH/bin:$PATH + PATH=$LOFARROOT/bin:$PATH fi export PATH if [ "$LD_LIBRARY_PATH" = "" ]; then - LD_LIBRARY_PATH=$LOFARPATH/lib + LD_LIBRARY_PATH=$LOFARROOT/lib else - LD_LIBRARY_PATH=$LOFARPATH/lib:$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$LOFARROOT/lib:$LD_LIBRARY_PATH fi export LD_LIBRARY_PATH