From f80b6d0b0f4e22aa976690b72a30f82d72f0d374 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Thu, 19 Nov 2015 15:56:46 +0100 Subject: [PATCH] Replaced QP_ROOT by in configure --- config/gfortran.cfg | 2 +- configure | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/gfortran.cfg b/config/gfortran.cfg index c1032aa1..d1f7bcdf 100644 --- a/config/gfortran.cfg +++ b/config/gfortran.cfg @@ -10,7 +10,7 @@ # # [COMMON] -FC : gfortran -g -ffree-line-length-none -I . +FC : gfortran -g -ffree-line-length-none -I . -static-libgcc LAPACK_LIB : -llapack -lblas IRPF90 : irpf90 IRPF90_FLAGS : --ninja --align=32 diff --git a/configure b/configure index 1bd08ee2..7370d540 100755 --- a/configure +++ b/configure @@ -438,11 +438,12 @@ def create_ninja_and_rc(l_installed): print str_info("qp_root"), python_path = [join(QP_ROOT, "scripts"), join(QP_ROOT, "install")] - l_python = [join(QP_ROOT, "scripts")] + l_python = [join("${QP_ROOT}", "scripts")] for dir_ in python_path: for folder in os.listdir(dir_): path = join(dir_, folder) if os.path.isdir(path): + path = path.replace(QP_ROOT,"${QP_ROOT}") l_python.append(path) path_ezfio = find_path('ezfio', l_installed, var_for_qp_root=True) @@ -451,9 +452,9 @@ def create_ninja_and_rc(l_installed): l_rc = [ 'export QP_ROOT={0}'.format(QP_ROOT), - 'export QP_EZFIO={0}'.format(path_ezfio), - 'export IRPF90={0}'.format(path_irpf90), - 'export NINJA={0}'.format(path_ninja), + 'export QP_EZFIO={0}'.format(path_ezfio.replace(QP_ROOT,"${QP_ROOT}")), + 'export IRPF90={0}'.format(path_irpf90.replace(QP_ROOT,"${QP_ROOT}")), + 'export NINJA={0}'.format(path_ninja.replace(QP_ROOT,"${QP_ROOT}")), 'export QP_PYTHON={0}'.format(":".join(l_python)), "", 'export PYTHONPATH="${QP_EZFIO}":"${QP_PYTHON}":"${PYTHONPATH}"', 'export PATH="${QP_PYTHON}":"${QP_ROOT}"/bin:"${QP_ROOT}"/ocaml:"${PATH}"',