Configure (TeXLive): Year of distribution no longer in directory

It is this time of year again: TeXLive has transitioned to its 2020 release
and the year is imprinted into the installation directory of TeXLive. Until
now, we have had to manually change this year and it caused complications
and was very annoying.

With this commit, the explicit year has been removed from TeXLive's
installation and we now simply put a `maneage' instead of the year. I tried
this on another system and it worked nicely. Until the time that we can
fully install LaTeX packages from source tarballs, this is the best thing
we could do for now.

2 files changed, 10 insertions, 12 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 7d2577a..46b79ca 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -1259,12 +1259,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." > $@