From 929420c71f8feea67cfe51c306b9a1d79b50a7bf Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 27 Mar 2015 08:43:11 +0100 Subject: [PATCH 1/2] Corrected #33 --- Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8427de4a..29f11113 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ BLUE= BLACK=(B -.PHONY: doc src curl m4 ocaml irpf90 emsl build binary +.PHONY: doc src ocaml build binary default: @echo ----------------------------------------------- @@ -26,16 +26,11 @@ build: @echo source quantum_package.rc @echo ----------------------------------------------- else -build: EZFIO curl m4 irpf90 emsl +build: $(MAKE) -C src $(MAKE) -C ocaml endif -curl: bin/curl -m4: bin/m4 -irpf90: bin/irpf90 -emsl: EMSL_Basis - binary: $(QPACKAGE_ROOT)/scripts/make_binary.sh From 8bafaeb60f6b4fafce223225f5c08cac4c642334 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Fri, 27 Mar 2015 09:06:50 +0100 Subject: [PATCH 2/2] Corrected 929420c71f8feea67cfe51c306b9a1d79b50a7bf --- setup_environment.sh | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/setup_environment.sh b/setup_environment.sh index ca853fdf..24d3f844 100755 --- a/setup_environment.sh +++ b/setup_environment.sh @@ -11,23 +11,6 @@ BLACK="(B" QPACKAGE_ROOT="$( cd "$(dirname "$BASH_SOURCE")" ; pwd -P )" -if [[ -z "${IRPF90}" ]] ; -then - make irpf90 - IRPF90="${QPACKAGE_ROOT}"/bin/irpf90 - if [[ ! -x "${IRPF90}" ]] - then - echo $RED "Error in IRPF90 installation" $BLACK - exit 1 - fi -fi - - -if [[ -z ${OCAMLBREW_BASE} ]] -then - export OCAMLBREW_BASE="$HOME/ocamlbrew" -fi - cat << EOF > quantum_package.rc export IRPF90="${IRPF90}" export QPACKAGE_ROOT=\$( cd \$(dirname "\${BASH_SOURCE}") ; pwd -P )