From c0aeac548a94548f5a849e0ae5e6e7d716385a27 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 29 Dec 2015 01:25:01 +0100 Subject: [PATCH] Fixed build.ninja and configure --- build.ninja | 2 +- configure.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build.ninja b/build.ninja index cd2a4ca..b949c98 100644 --- a/build.ninja +++ b/build.ninja @@ -68,7 +68,7 @@ build qmcchem.tar.gz: create_archive # Ocaml # ----- -build ocaml/generated.ninja : compile_ocaml_dep | EZFIO/Ocaml/ezfio.ml always +build ocaml/generated.ninja : compile_ocaml_dep | EZFIO/Ocaml/ezfio.ml always || src/irpf90.make build ocaml/qmcchem : compile_ocaml | ocaml/generated.ninja EZFIO/Ocaml/ezfio.ml target = qmcchem diff --git a/configure.sh b/configure.sh index 5da8621..7b618cf 100755 --- a/configure.sh +++ b/configure.sh @@ -19,7 +19,9 @@ then touch _build/ninja.ok fi touch "${QMCCHEM_PATH}"/{src,ocaml}/.ls_md5 -exec "${QMCCHEM_PATH}"/bin/ninja "$@" +"${QMCCHEM_PATH}"/bin/ninja "$@" + +cd "${QMCCHEM_PATH}" if [[ ! -f make.config ]] then @@ -34,9 +36,10 @@ fi echo "=====================================================================" echo "Configuration OK." -echo "Now, source the qmcchemrc file:" +echo "Now, source the qmcchemrc file and build the program:" echo "" echo "source qmcchemrc" +echo "ninja" echo "" echo "====================================================================="