Installation year removed from TeXLive installation

TeXLive recently transitioned from its 2019 version to its 2020 version
thanks to Elham Saremi's trial of the this project. The fact that
traditionally Maneage installs all TeXLive packages in a per-year directory
is very annoying and required an update in the core Maneage system every
year. So I suddently recognized that we can fix this by setting a different
name for the directory holding the release year. This has been implemented
with this commit.

I have also done this change in the main Maneage branch for other projects
to also benefit from this correction.

2 files changed, 11 insertions, 13 deletions

diff --git a/reproduce/software/config/installation/texlive.conf b/reproduce/software/config/installation/texlive.conf
index 2e86ac4..b5075c6 100644
--- a/reproduce/software/config/installation/texlive.conf
+++ b/reproduce/software/config/installation/texlive.conf
@@ -9,19 +9,19 @@
 # this notice are preserved.  This file is offered as-is, without any
 # warranty.
 selected_scheme scheme-basic
-TEXDIR @installdir@/texlive/2019
-TEXMFCONFIG @installdir@/texlive2019/texmf-config
+TEXDIR @installdir@/texlive/maneage
+TEXMFCONFIG @installdir@/texlive-maneage/texmf-config
 TEXMFLOCAL @installdir@/texlive/texmf-local
-TEXMFSYSCONFIG @installdir@/texlive/2019/texmf-config
-TEXMFSYSVAR @installdir@/texlive/2019/texmf-var
-TEXMFVAR @installdir@/texlive2019/texmf-var
+TEXMFSYSCONFIG @installdir@/texlive/maneage/texmf-config
+TEXMFSYSVAR @installdir@/texlive/maneage/texmf-var
+TEXMFVAR @installdir@/texlive-maneage/texmf-var
 instopt_adjustpath 0
 instopt_adjustrepo 1
 instopt_letter 0
 instopt_portable 0
 instopt_write18_restricted 1
 tlpdbopt_autobackup 1
-tlpdbopt_backupdir @installdir@/texlive/2019/backups
+tlpdbopt_backupdir @installdir@/texlive/maneage/backups
 tlpdbopt_create_formats 1
 tlpdbopt_desktop_integration 1
 tlpdbopt_file_assocs 1
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index cdaaf7d..b0847a9 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -1261,12 +1261,10 @@ $(itidir)/texlive-ready-tlmgr: reproduce/software/config/installation/texlive.co
         # don't want the configure script to fail if it can't run.
 	if ./install-tl --profile=texlive.conf -repository $(tlmirror); then
 
-          # Put a symbolic link of the TeX Live executables in `ibdir'. The
-          # main problem is that the year and build system (for example
-          # `x86_64-linux') are also in the directory names, making it hard
-          # to be generic. We are using wildcards here, but only in this
-          # Makefile, not in any other.
-	  ln -fs $(idir)/texlive/20*/bin/*/* $(ibdir)/
+          # Put a symbolic link of the TeX Live executables in `ibdir' to
+          # avoid all the complexities of its sub-directories and additions
+          # to PATH.
+	  ln -fs $(idir)/texlive/maneage/bin/*/* $(ibdir)/
 
           # Register that the build was successful.
 	  echo "TeX Live is ready." > $@
@@ -1326,7 +1324,7 @@ $(itidir)/texlive: reproduce/software/config/installation/texlive-packages.conf
 
           # Make a symbolic link of all the TeX Live executables in the bin
           # directory so we don't have to modify `PATH'.
-	  ln -fs $(idir)/texlive/20*/bin/*/* $(ibdir)/
+	  ln -fs $(idir)/texlive/maneage/bin/*/* $(ibdir)/
 
           # Get all the necessary versions.
 	  texlive=$$(pdflatex --version | awk 'NR==1' | sed 's/.*(\(.*\))/\1/' \