From 8bbe54dd3db007752cd1145caaaa9fe7d7084762 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Tue, 1 Oct 2019 20:05:51 +0100 Subject: Minor corrections in configure and prepare phase Since ImageMagick can take long to build, we are now building it in parallel. Also, the part where we replace an `_' with `\_' in the software version at the end of the configure script was removed. It is more clear/readable that the actual rule that includes such a name deals with the underline (as is the case for `sip_tpv' which already dealt with it). Finally, I noticed that the checks at the start of `top-prepare' were missing new-lines. I had forgot that the Make single-shell variable isn't activated in this stage yet. --- reproduce/analysis/make/top-prepare.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'reproduce/analysis/make/top-prepare.mk') diff --git a/reproduce/analysis/make/top-prepare.mk b/reproduce/analysis/make/top-prepare.mk index e03e890..473911c 100644 --- a/reproduce/analysis/make/top-prepare.mk +++ b/reproduce/analysis/make/top-prepare.mk @@ -44,20 +44,20 @@ all: $(BDIR)/software/preparation-done.mk echo "Please run the following command to start building the project." echo "(Replace '8' with the number of CPU threads on your system)" echo "" - if [ "x$(GROUP-NAME)" = x ]; then - echo " $$ ./project make" - else - echo " $$ ./project make --group=$(GROUP-NAME) -j8" + if [ "x$(GROUP-NAME)" = x ]; then \ + echo " $$ ./project make"; \ + else \ + echo " $$ ./project make --group=$(GROUP-NAME) -j8"; \ fi echo "" else all: - @if [ "x$(GROUP-NAME)" = x ]; then - echo "Project is NOT configured for groups, please run" - echo " $$ ./project prepare" - else - echo "Project is configured for groups, please run" - echo " $$ ./project prepare --group=$(GROUP-NAME) -j8" + @if [ "x$(GROUP-NAME)" = x ]; then \ + echo "Project is NOT configured for groups, please run"; \ + echo " $$ ./project prepare"; \ + else \ + echo "Project is configured for groups, please run"; \ + echo " $$ ./project prepare --group=$(GROUP-NAME) -j8"; \ fi endif -- cgit v1.2.1