Skip to content
Snippets Groups Projects
Commit 70d0060b authored by Administrator's avatar Administrator Committed by Florian Uhlig
Browse files

Change default setting of config scripts

Due to some changes in CbmRoot recently the existing PATH and LD_LIBRARY_PATH
variable were overwritten when sourcing the config scripts (config.sh and
config.csh) whithout additional parameter -a or -p.
This commit change the default setting such that the new paths are appended to
the existing PATH and (DY)LD_LIBRARY_PATH.
parent 577bcfa4
No related branches found
No related tags found
1 merge request!956Prepare build system for modern cmake (part 1)
Pipeline #19135 passed
...@@ -43,9 +43,11 @@ if ( "$same_system" == "1" ) then ...@@ -43,9 +43,11 @@ if ( "$same_system" == "1" ) then
echo "hello" echo "hello"
breaksw breaksw
case * : case * :
setenv DYLD_LIBRARY_PATH="@MY_DYLD_LIBRARY_PATH@" echo "Default was changed"
setenv LD_LIBRARY_PATH="@MY_LD_LIBRARY_PATH@" echo "Append new paths to LD_LIBRARY_PATH and PATH instead of overwritting"
setenv PATH="@MY_PATH@" setenv DYLD_LIBRARY_PATH $DYLD_LIBRARY_PATH:"@MY_DYLD_LIBRARY_PATH@"
breaksw setenv LD_LIBRARY_PATH $LD_LIBRARY_PATH:"@MY_LD_LIBRARY_PATH@"
setenv PATH $PATH:"@MY_PATH@"
breaksw
endsw endsw
endif endif
...@@ -41,9 +41,11 @@ if [ $same_system -eq 1 ]; then ...@@ -41,9 +41,11 @@ if [ $same_system -eq 1 ]; then
export PATH="@MY_PATH@":$PATH export PATH="@MY_PATH@":$PATH
;; ;;
* ) * )
export DYLD_LIBRARY_PATH="@MY_DYLD_LIBRARY_PATH@" echo "Default was changed"
export LD_LIBRARY_PATH="@MY_LD_LIBRARY_PATH@" echo "Append new paths to LD_LIBRARY_PATH and PATH instead of overwritting"
export PATH="@MY_PATH@" export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:"@MY_DYLD_LIBRARY_PATH@"
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"@MY_LD_LIBRARY_PATH@"
export PATH=$PATH:"@MY_PATH@"
;; ;;
esac esac
fi fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment