aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2019-07-28 15:17:17 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2019-07-28 15:17:17 +0100
commitda1123c78780b2f35a626fd694aff427e3e12892 (patch)
treeb83868b2c3529df8998ba940c331f88685159b66
parent6ef4cc854d1df46b719de5d66b45537b0aa11f92 (diff)
Corrected typo in environment before running make
We recently moved the system's `rm' program absolute address to a shell variable that is found during the `./project' script. But I had forgot to account for the difference between the Make and Bash variable naming differences. I had also forgot to add a value to the HOME variable. With this commit both are corrected: the system's `rm' path is now called `sys_rm' and the HOME variable is set.
-rw-r--r--.file-metadatabin6239 -> 6187 bytes
-rwxr-xr-xproject2
-rw-r--r--reproduce/analysis/make/initialize.mk6
3 files changed, 4 insertions, 4 deletions
diff --git a/.file-metadata b/.file-metadata
index 1e4b3c5..cef42f3 100644
--- a/.file-metadata
+++ b/.file-metadata
Binary files differ
diff --git a/project b/project
index b366e00..c60bba1 100755
--- a/project
+++ b/project
@@ -265,7 +265,7 @@ EOF
# Remove all existing environment variables (with `env -i') and
# only use some pre-defined environment variables, then build the
# project.
- envmake=".local/bin/env -i HOME= sys-rm=$(which rm) $gopt"
+ envmake=".local/bin/env -i HOME=$bdir sys_rm=$(which rm) $gopt"
envmake="$envmake .local/bin/make -f reproduce/analysis/make/top.mk"
if ! [ x"$debug" = x ]; then envmake="$envmake --debug=$debug"; fi
diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk
index f8a09e6..bf79c94 100644
--- a/reproduce/analysis/make/initialize.mk
+++ b/reproduce/analysis/make/initialize.mk
@@ -200,9 +200,9 @@ distclean: clean
# We'll be deleting the built environent programs and just need the
# `rm' program. So for this recipe, we'll use the host system's
# `rm', not our own.
- $$sys-rm -rf $(BDIR)
- $$sys-rm -f Makefile .gnuastro .local .build
- $$sys-rm -f $(pconfdir)/LOCAL.mk $(gconfdir)/gnuastro-local.conf
+ $$sys_rm -rf $(BDIR)
+ $$sys_rm -f Makefile .gnuastro .local .build
+ $$sys_rm -f $(pconfdir)/LOCAL.mk $(gconfdir)/gnuastro-local.conf