From b8a676e6a9163cce8c8630c430b5501fe16562bd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 11 Mar 2011 19:49:37 +0000 Subject: biber setup in build tree git-svn-id: svn://tug.org/texlive/trunk@21690 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLUtils.pm | 9 ++++++--- Master/tlpkg/dev/srclist.txt | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 97f35efb9ba..b2f94b17c1a 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -224,10 +224,13 @@ subsequent calls just return that value. sub platform { unless (defined $::_platform_) { - if ($^O=~/^MSWin(32|64)$/i) { - $::_platform_="win32"; + if ($^O =~ /^MSWin$/i) { + $::_platform_ = "win32"; } else { - my $config_guess = "$::installerdir/tlpkg/installer/config.guess"; + # the copy of this file in biber uses a different config.guess dir. + my $config_guess_dir = $TeXLive::TLConfig::Config_Guess_Dir + || "$::installerdir/tlpkg/installer"; + my $config_guess = "$config_guess_dir/config.guess"; # We cannot rely on #! in config.guess but have to call /bin/sh # explicitly because sometimes the 'noexec' flag is set in diff --git a/Master/tlpkg/dev/srclist.txt b/Master/tlpkg/dev/srclist.txt index a01ba2f3d38..5c4238b96e8 100644 --- a/Master/tlpkg/dev/srclist.txt +++ b/Master/tlpkg/dev/srclist.txt @@ -18,6 +18,9 @@ Master/texmf/web2c/texmf.cnf Build/source/texk/kpathsea/ Master/texmf/web2c/fmtutil.cnf Build/source/texk/tetex/ # +# Platform detection for biber. +Master/tlpkg/TeXLive/TLUtils.pm Build/source/utils/biber/TeXLive/ +# # kpse getopt used in non-kpse program. Build/source/texk/kpathsea/getopt.c Build/source/utils/chktex/ Build/source/texk/kpathsea/getopt1.c Build/source/utils/chktex/ -- cgit v1.2.3