summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-03-11 19:49:37 +0000
committerKarl Berry <karl@freefriends.org>2011-03-11 19:49:37 +0000
commitb8a676e6a9163cce8c8630c430b5501fe16562bd (patch)
tree0fdb621af80498818ee592239056ccb80e7e58f0 /Master
parentb53c86e88b3c0020977dbc4557a1fa7c3879849e (diff)
biber setup in build tree
git-svn-id: svn://tug.org/texlive/trunk@21690 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm9
-rw-r--r--Master/tlpkg/dev/srclist.txt3
2 files changed, 9 insertions, 3 deletions
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/