summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl5
1 files changed, 4 insertions, 1 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 717a1ac1b42..0a285b8f724 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -502,8 +502,11 @@ if ($opt_profile eq "") {
if ($tlmgrwhich) {
my $dn = dirname($tlmgrwhich);
$dn = abs_path("$dn/../..");
+ # The "make Karl happy" case, check that we are not running install-tl
+ # from the same tree where tlmgr is hanging around
+ my $install_tl_root = abs_path($::installerdir);
my $tlpdboldpath = "$dn/$TeXLive::TLConfig::InfraLocation/$TeXLive::TLConfig::DatabaseName";
- if (-r $tlpdboldpath) {
+ if (-r $tlpdboldpath && $dn ne $install_tl_root) {
# we found an old installation, so read that one in and save
# the list installed collections into an array.
$previoustlpdb = TeXLive::TLPDB->new(root => $dn);