diff options
| author | Norbert Preining <preining@logic.at> | 2017-04-20 14:47:40 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2017-04-20 14:47:40 +0000 |
| commit | 41ca4e53eb135aff20a0eba4cffdb2cfb65e10e5 (patch) | |
| tree | e7fef25a86feeee38d64b047d80f9267ce72bdcc | |
| parent | d67816bd0f2d601275ee62dcffb3ecf3f00e65bb (diff) | |
set defaults for TEXMF{VAR,CONFIG,HOME} on darwin
git-svn-id: svn://tug.org/texlive/trunk@43939 c570f23f-e606-0410-a88d-b1316a301751
| -rwxr-xr-x | Master/install-tl | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/Master/install-tl b/Master/install-tl index 34d4e083214..575bb5b1cab 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -1430,17 +1430,29 @@ sub set_texlive_default_dirs { ? abs_path($::installerdir) : $vars{'TEXDIR'}; my $texmfhome = getenv('TEXLIVE_INSTALL_TEXMFHOME'); - $texmfhome ||= "~"; + if (platform() =~ m/darwin/) { + $texmfhome ||= "~/Library"; + } else { + $texmfhome ||= "~"; + } $vars{'TEXMFHOME'} = "$texmfhome/texmf"; # use the $texmfhome value just computed for these. my $yyyy = $TeXLive::TLConfig::ReleaseYear; my $texmfvar = getenv('TEXLIVE_INSTALL_TEXMFVAR'); - $texmfvar ||= "$texmfhome/.texlive$yyyy/texmf-var"; + if (platform() =~ m/darwin/) { + $texmfvar ||= "$texmfhome/texlive/$yyyy/texmf-var"; + } else { + $texmfvar ||= "$texmfhome/.texlive$yyyy/texmf-var"; + } $vars{'TEXMFVAR'} = $texmfvar; my $texmfconfig = getenv('TEXLIVE_INSTALL_TEXMFCONFIG'); - $texmfconfig ||= "$texmfhome/.texlive$yyyy/texmf-config"; + if (platform() =~ m/darwin/) { + $texmfconfig ||= "$texmfhome/texlive/$yyyy/texmf-config"; + } else { + $texmfconfig ||= "$texmfhome/.texlive$yyyy/texmf-config"; + } $vars{'TEXMFCONFIG'} = $texmfconfig; # for portable installation we want everything in one directory |