diff options
| -rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 14 | ||||
| -rwxr-xr-x | Master/tlpkg/installer/config.guess (renamed from Master/config.guess) | 0 | ||||
| -rwxr-xr-x | Master/tlpkg/installer/config.sub (renamed from Master/config.sub) | 0 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 5b09bfd6c5f..2f4994aadee 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -151,20 +151,21 @@ the HD/CD/DVD. =cut sub platform { - my @OSs=qw(aix cygwin darwin freebsd hpux irix linux netbsd openbsd - solaris); - unless (defined $::_platform_) { if ($^O=~/^MSWin(32|64)$/i) { $::_platform_="win32"; } else { + my $config_guess="$::installerdir/tlpkg/installer/config.guess"; + my @OSs=qw(aix cygwin darwin freebsd hpux irix linux netbsd + openbsd solaris); my $CPU; # CPU type as reported by config.guess. my $OS; # O/S type as reported by config.guess. # We cannot rely on #! in config.guess but have to call /bin/sh # explicitly because sometimes the 'noexec' flag is set in # /etc/fstab for ISO9660 file systems. - my $guessed_platform=`/bin/sh $::installerdir/config.guess`; + my $guessed_platform=`/bin/sh $config_guess`; chomp $guessed_platform; + $guessed_platform=~s/^x86_64-(.*)-freebsd$/amd64-$1-freebsd/; ($CPU=$guessed_platform)=~s/(.*?)-.*/$1/; foreach my $os (@OSs) { $OS=$os if $guessed_platform=~/$os/; @@ -172,7 +173,7 @@ sub platform { if ($CPU=~/^i.86$/) { $CPU=~s/i.86/i386/; } - if (length "$OS" < 0) { + unless (defined $OS) { ($OS=$guessed_platform)=~s/.*-(.*)/$1/; } $::_platform_="$CPU-$OS"; @@ -190,8 +191,7 @@ given C<i386-linux> we return C<Intel x86 with GNU/Linux>. =cut -sub platform_desc -{ +sub platform_desc { my ($platform) = @_; my %platform_name=( diff --git a/Master/config.guess b/Master/tlpkg/installer/config.guess index 6cc26cd3df1..6cc26cd3df1 100755 --- a/Master/config.guess +++ b/Master/tlpkg/installer/config.guess diff --git a/Master/config.sub b/Master/tlpkg/installer/config.sub index 5defff65a6e..5defff65a6e 100755 --- a/Master/config.sub +++ b/Master/tlpkg/installer/config.sub |