@@ -312,11 +312,11 @@ find_or_install()
312312 export CC=$package_install_path /bin/gcc
313313 export CXX=$package_install_path /bin/g++
314314 if [[ -z " $LD_LIBRARY_PATH " ]]; then
315- echo " $this_script : export LD_LIBRARY_PATH=$package_install_path /lib /"
316- export LD_LIBRARY_PATH=$package_install_path /lib /
315+ echo " $this_script : export LD_LIBRARY_PATH=$package_install_path /lib64 /"
316+ export LD_LIBRARY_PATH=$package_install_path /lib64 /
317317 else
318- echo " $this_script : export LD_LIBRARY_PATH=$package_install_path /lib /:$LD_LIBRARY_PATH "
319- export LD_LIBRARY_PATH=$package_install_path /lib /:$LD_LIBRARY_PATH
318+ echo " $this_script : export LD_LIBRARY_PATH=$package_install_path /lib64 /:$LD_LIBRARY_PATH "
319+ export LD_LIBRARY_PATH=$package_install_path /lib64 /:$LD_LIBRARY_PATH
320320 fi
321321 # Remove $package from the dependency stack
322322 stack_pop dependency_pkg package_done
@@ -676,9 +676,9 @@ find_or_install()
676676 echo " $this_script : export CXX=$package_install_path /bin/g++"
677677 export CXX=" $package_install_path /bin/g++"
678678 if [[ -z " $LD_LIBRARY_PATH " ]]; then
679- export LD_LIBRARY_PATH=" $package_install_path /lib /"
679+ export LD_LIBRARY_PATH=" $package_install_path /lib64 /"
680680 else
681- export LD_LIBRARY_PATH=" $package_install_path /lib /:$LD_LIBRARY_PATH "
681+ export LD_LIBRARY_PATH=" $package_install_path /lib64 /:$LD_LIBRARY_PATH "
682682 fi
683683 elif [[ $package == " mpich" ]]; then
684684 echo " $this_script : export MPIFC=$package_install_path /bin/mpif90"
@@ -860,8 +860,15 @@ report_results()
860860 echo " export PATH=\" $m4_install_path /bin\" :\$ PATH " >> setup.sh
861861 echo " fi " >> setup.sh
862862 fi
863- setup_sh_location=$install_path
864- $SUDO mv setup.sh $install_path || setup_sh_location=${PWD}
863+ opencoarrays_install_path=$install_path
864+ if [[ -x " $opencoarrays_install_path /bin/caf" ]]; then
865+ echo " if [[ -z \"\$ PATH\" ]]; then " >> setup.sh
866+ echo " export PATH=\" $opencoarrays_install_path /bin\" " >> setup.sh
867+ echo " else " >> setup.sh
868+ echo " export PATH=\" $opencoarrays_install_path /bin\" :\$ PATH " >> setup.sh
869+ echo " fi " >> setup.sh
870+ fi
871+ $SUDO mv setup.sh $opencoarrays_install_path && setup_sh_location=$opencoarrays_install_path || setup_sh_location=${PWD}
865872 echo " *** Before using caf, cafrun, or build, please execute the following command ***"
866873 echo " *** or add it to your login script and launch a new shell (or the equivalent ***"
867874 echo " *** for your shell if you are not using a bash shell): ***"
0 commit comments