aboutsummaryrefslogtreecommitdiff
path: root/reproduce/software
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2020-06-30 21:22:23 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2020-06-30 21:22:23 +0100
commitede22ee5721690ac5782efdfe15dedbf9a300469 (patch)
tree0320d30ab532efd67cccd5f64422ed4f0c380dcb /reproduce/software
parentf8078be6c1edda20664c9565cf71a0a1cbb4ac7e (diff)
parentdb31bce606eb82440019cca434a78ba4097a1af3 (diff)
Imported Maneage infrastructure, no conflicts
There weren't any conflicts in this merge.
Diffstat (limited to 'reproduce/software')
-rw-r--r--reproduce/software/make/high-level.mk4
-rwxr-xr-xreproduce/software/shell/configure.sh4
2 files changed, 5 insertions, 3 deletions
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index ac84c87..cf104e6 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -1296,7 +1296,9 @@ $(ibidir)/util-linux-$(util-linux-version):
ln -sf $(idir)/util-linux/sbin/* $(idir)/bin
fi
- # Write the main target.
+ # Clean up and write the main target.
+ cd ../
+ rm -rf util-linux-$(util-linux-version)
echo "util-Linux $(util-linux-version)" > $@
$(ibidir)/xlsxio-$(xlsxio-version): \
diff --git a/reproduce/software/shell/configure.sh b/reproduce/software/shell/configure.sh
index 38dcf7f..fc34ca9 100755
--- a/reproduce/software/shell/configure.sh
+++ b/reproduce/software/shell/configure.sh
@@ -872,7 +872,7 @@ EOF
# In case an input-directory is given, write it in 'indir'.
if [ x$inindir != x ]; then
- indir=$inindir
+ indir=$(absolute_dir $inindir)
echo " -- Using '$indir'"
fi
fi
@@ -916,7 +916,7 @@ EOF
# If given, write the software directory.
if [ x"$tmpddir" != x ]; then
- ddir=$tmpddir
+ ddir=$(absolute_dir $tmpddir)
echo " -- Using '$ddir'"
fi
fi