From f32b509313a9427347db0275ed09cb1b70bb3d89 Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Tue, 30 Jun 2020 15:45:17 +0100
Subject: Entered data and software directories stored as absolute addresses

Until now, when the user specified an input and software directory, the raw
string they entered was used. But when this string was a relative location,
this could be problematic in general scenarios.

With this commit, the same function that finds the absolute location of the
build directory is used to find the absolute address of the data and
software directories.
---
 reproduce/software/shell/configure.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'reproduce/software')

diff --git a/reproduce/software/shell/configure.sh b/reproduce/software/shell/configure.sh
index 323aed1..f428416 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
-- 
cgit v1.2.1


From db31bce606eb82440019cca434a78ba4097a1af3 Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Tue, 30 Jun 2020 17:00:25 +0100
Subject: Proper deletion of util-linux source after successfully building it

After recently adding util-linux to Maneage build-tree, we had forgot to
delete the unpacked and built source directory after it was installed! This
has been corrected with this commit.
---
 reproduce/software/make/high-level.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'reproduce/software')

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): \
-- 
cgit v1.2.1