From 6e4523524b2350d9df30d8a30d5e32989a821cb0 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 27 Mar 2015 09:45:37 +0100 Subject: [PATCH] Fixed IRPF90 environment variable --- .travis.yml | 4 ++-- scripts/run_Makefile_global.sh | 2 ++ setup_environment.sh | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b29a49e..0db0f5d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,10 @@ sudo: true before_script: - sudo apt-get update - - sudo apt-get install gfortran liblapack-dev zip + - sudo apt-get install gfortran liblapack-dev script: - - ./setup_environment.sh --robot + - ./setup_environment.sh --robot - source ./quantum_package.rc - cp ./src/Makefile.config.gfortran ./src/Makefile.config - make build diff --git a/scripts/run_Makefile_global.sh b/scripts/run_Makefile_global.sh index 82dee8ab..fc9e168a 100755 --- a/scripts/run_Makefile_global.sh +++ b/scripts/run_Makefile_global.sh @@ -18,6 +18,8 @@ source ${QPACKAGE_ROOT}/scripts/qp_include.sh check_current_dir_is_src +IRPF90="${QPACKAGE_ROOT}/bin/irpf90 ${IRPF90_FLAGS}" + # Check if the user's config exists if [[ ! -f ${QPACKAGE_ROOT}/src/Makefile.config ]] diff --git a/setup_environment.sh b/setup_environment.sh index 24d3f844..a35746bc 100755 --- a/setup_environment.sh +++ b/setup_environment.sh @@ -41,7 +41,6 @@ then exit 1 fi - if [[ ! -x ${QPACKAGE_ROOT}/bin/irpman ]] then echo $RED "Error in IRPF90 installation" $BLACK