diff options
| -rwxr-xr-x | Build/source/Build | 20 | ||||
| -rwxr-xr-x | Master/tlpkg/installer/install-menu-text.pl | 10 |
2 files changed, 17 insertions, 13 deletions
diff --git a/Build/source/Build b/Build/source/Build index edfb37ca29c..a394c0ba49f 100755 --- a/Build/source/Build +++ b/Build/source/Build @@ -28,6 +28,10 @@ fi # allow override of make program. : ${TL_MAKE=make} +# and then also set GNUMAKE to that, for the sake of freetype2/configure. +: ${GNUMAKE=${TL_MAKE}} +export GNUMAKE + if test "x$1" = x--no-clean; then shift else @@ -48,28 +52,28 @@ cd $TL_WORKDIR || exit 1 # allow override of configure location, just in case. : ${TL_CONFIGURE=../configure} +# longinteger and off_t declarations are still inconsistent, do not +# enable this unless you are testing. +: ${TL_CONF_LARGEFILE=--disable-largefile} + # allow override of xdvi toolkit, default to standard xaw. : ${TL_CONF_XDVI_TOOLKIT=--with-xdvi-x-toolkit=xaw} -# default to building ICU without thread support (xetex doesn't need it). +# default to building ICU without thread support, since xetex doesn't need it. : ${TL_CONF_THREADS=--disable-threads} # default to include freetype2 support for old Mac font file formats. : ${TL_CONF_MAC_FONTS=--with-old-mac-fonts} -# avoid xindy by default, it requires clisp (see utils/README). +# skip xindy by default, it requires clisp (see utils/README). : ${TL_CONF_XINDY=--without-xindy} -# allow adding other configure args. +# allow adding arbitrary other configure args. : ${TL_CONFIGURE_ARGS=} # allow override of make target. : ${TL_TARGET=world} -# and then also set GNUMAKE to that, for the sake of freetype2/configure. -: ${GNUMAKE=${TL_MAKE}} -export GNUMAKE - # Kpathsea is not going to be able to find its cnf files during the # build, so omit the warning about it. : ${KPATHSEA_WARNING=0} @@ -82,7 +86,7 @@ export GNUMAKE eval $TL_BUILD_ENV time $TL_CONFIGURE \ --prefix=$TL_INSTALL_DEST \ --datadir=$TL_INSTALL_DEST \ - --disable-largefile \ + $TL_CONF_LARGEFILE \ $TL_CONF_XDVI_TOOLKIT \ $TL_CONF_THREADS \ $TL_CONF_MAC_FONTS \ diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index 665ebec3535..4ee41f79293 100755 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -475,7 +475,7 @@ EOF $home = getenv('USERPROFILE') if (win32); $home ||= '~'; if ("\u$answer" eq '1') { - print "New value $maindir [$vars{$maindir}]: "; + print "New value for $maindir [$vars{$maindir}]: "; chomp($answer=<STDIN>); $vars{$maindir}="$answer" if (length $answer); $vars{$maindir}=~s@\\@/@g if (win32); @@ -495,7 +495,7 @@ EOF } } elsif ("\u$answer" eq '2') { - print "New value TEXMFLOCAL [$vars{'TEXMFLOCAL'}]: "; + print "New value for TEXMFLOCAL [$vars{'TEXMFLOCAL'}]: "; chomp($answer=<STDIN>); $vars{'TEXMFLOCAL'}="$answer" if (length $answer); $vars{'TEXMFLOCAL'}=~s@\\@/@g if (win32); @@ -503,7 +503,7 @@ EOF return $command{'self'}; } elsif ("\u$answer" eq '3') { - print "New value TEXMFSYSVAR [$vars{'TEXMFSYSVAR'}]: "; + print "New value for TEXMFSYSVAR [$vars{'TEXMFSYSVAR'}]: "; chomp($answer=<STDIN>); $vars{'TEXMFSYSVAR'}="$answer" if (length $answer); $vars{'TEXMFSYSVAR'}=~s@\\@/@g if (win32); @@ -511,7 +511,7 @@ EOF return $command{'self'}; } elsif ("\u$answer" eq '4') { - print "New value TEXMFSYSCONFIG [$vars{'TEXMFSYSCONFIG'}]: "; + print "New value for TEXMFSYSCONFIG [$vars{'TEXMFSYSCONFIG'}]: "; chomp($answer=<STDIN>); $vars{'TEXMFSYSCONFIG'}="$answer" if (length $answer); $vars{'TEXMFSYSCONFIG'}=~s@\\@/@g if (win32); @@ -519,7 +519,7 @@ EOF return $command{'self'}; } elsif ("\u$answer" eq '5') { - print "New value TEXMFHOME [$vars{'TEXMFHOME'}]: "; + print "New value for TEXMFHOME [$vars{'TEXMFHOME'}]: "; chomp($answer=<STDIN>); $vars{'TEXMFHOME'}="$answer" if (length $answer); $vars{'TEXMFHOME'}=~s@\\@/@g if (win32); |