diff options
Diffstat (limited to 'Build/source/texk/dvi2tty')
-rwxr-xr-x | Build/source/texk/dvi2tty/configure | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/Build/source/texk/dvi2tty/configure b/Build/source/texk/dvi2tty/configure index e7420f17b21..db37cf30a82 100755 --- a/Build/source/texk/dvi2tty/configure +++ b/Build/source/texk/dvi2tty/configure @@ -1039,13 +1039,12 @@ fi echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6 echo "configure:1042: checking where the main texmf tree is located" >&5 +case $prefix in + */) prefix=`echo "$prefix" | sed 's@/*$@@'`;; +esac texmfmain= -if test -n "$TEXMFMAIN"; then - texmfmain="$TEXMFMAIN" - echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6 - -elif test "x$datadir" != 'x${prefix}/share'; then - # datadir is explicitly defined, assume datadir/texmf. +if test "x$datadir" != 'x${prefix}/share'; then + # First case, datadir is defined... eval p=\"$datadir\" # Unconditionally set the directory, but... texmfmain=`echo "$p/texmf" | sed 's,//*,/,g'` @@ -1054,17 +1053,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then echo "$ac_t"""$texmfmain"" 1>&6 else echo "$ac_t""not found" 1>&6 - echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2 - echo "configure: warning: proceeding anyway. + echo "configure: warning: No texmf tree found at $texmfmain. ***************************************************************** - * Warning: The main texmf tree was not found. * - * If you do not have the files, you should be able to find them * - * at the same place you got these sources, or from one of the * - * CTAN hosts. Good luck. * + * Error: The main texmf tree was not found. * + * If you do not have the files, you should be able to them from * + * the same place you got these sources from, or from one of the * + * CTAN hosts. * ***************************************************************** -" 1>&2 + Winging it." 1>&2 fi - else # Second case, datadir is default... if test "x$prefix" = "xNONE"; then @@ -1091,7 +1088,7 @@ else echo "$ac_t""not found" 1>&6 echo "configure: warning: The main texmf tree was not found at $texmfmain. ***************************************************************** - * Warning: The main texmf tree was not found. * + * Error: The main texmf tree was not found. * * Use the --datadir option to specify its parent directory. * * If you do not have the files, you should be able to them from * * the same place you got these sources from, or from one of the * |