summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-06-04 07:56:53 +0000
committerNorbert Preining <preining@logic.at>2008-06-04 07:56:53 +0000
commit521246ba0df7c0f432d04afe3883edb371455e07 (patch)
tree901834fad806f556390299a3d3f174ec63a4fe3f /Master/install-tl
parent36a5045c67599bb8cde8ba2ab9b9e5aa40f6d8ab (diff)
installer: support TEXMFSYSCONFIG adjustment
git-svn-id: svn://tug.org/texlive/trunk@8542 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl20
1 files changed, 20 insertions, 0 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 483f181fec6..89fd8772c6e 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -263,6 +263,7 @@ if ($opt_arch) {
# update_assocs();
}
mkdirhier "$vars{'TEXMFCONFIG'}";
+ mkdirhier "$vars{'TEXMFSYSCONFIG'}";
if (not -d "$vars{'TEXMFSYSVAR'}" ) {
print "About to generate some files... Press <enter>";
<STDIN>;
@@ -468,12 +469,14 @@ sub set_platforms_supported {
# TEXLIVE_INSTALL_PREFIX /usr/local/texlive => $tex_prefix
# TEXLIVE_INSTALL_TEXDIR $tex_prefix/2007 => $TEXDIR
# TEXLIVE_INSTALL_TEXMFSYSVAR $TEXDIR/texmf-var
+# TEXLIVE_INSTALL_TEXMFSYSCONFIG $TEXDIR/texmf-config
# TEXLIVE_INSTALL_TEXMFLOCAL $tex_prefix/texmf-local
# TEXLIVE_INSTALL_TEXMFHOME '$HOME/texmf'
sub set_texlive_default_dirs {
my $tex_prefix;
my $texmfsysvar;
+ my $texmfsysconfig;
my $texmflocal;
my $texmfhome;
@@ -492,6 +495,10 @@ sub set_texlive_default_dirs {
$texmfsysvar||=$vars{'TEXDIR'} . '/texmf-var';
$vars{'TEXMFSYSVAR'}="$texmfsysvar";
+ $texmfsysconfig=getenv('TEXLIVE_INSTALL_TEXMFSYSCONFIG');
+ $texmfsysconfig||=$vars{'TEXDIR'} . '/texmf-config';
+ $vars{'TEXMFSYSCONFIG'}="$texmfsysconfig";
+
$texmflocal=getenv('TEXLIVE_INSTALL_TEXMFLOCAL');
$texmflocal||="$tex_prefix/texmf-local";
$vars{'TEXMFLOCAL'}="$texmflocal";
@@ -723,6 +730,7 @@ sub create_profile {
print $fh "$key $vars{$key}\n" if $key=~/^option_symlinks/;
print $fh "$key $vars{$key}\n" if $key=~/^TEXDIR/;
print $fh "$key $vars{$key}\n" if $key=~/^TEXMFSYSVAR/;
+ print $fh "$key $vars{$key}\n" if $key=~/^TEXMFSYSCONFIG/;
print $fh "$key $vars{$key}\n" if $key=~/^TEXMFLOCAL/;
print $fh "$key $vars{$key}\n" if $key=~/^TEXMFHOME/;
}
@@ -798,6 +806,7 @@ sub save_options_into_tlpdb {
sub do_postinst_stuff {
my $TEXDIR="$vars{'TEXDIR'}";
my $TEXMFSYSVAR="$vars{'TEXMFSYSVAR'}";
+ my $TEXMFSYSCONFIG="$vars{'TEXMFSYSCONFIG'}";
my $TEXMFLOCAL="$vars{'TEXMFLOCAL'}";
do_texmf_cnf() unless $opt_portable;
@@ -907,6 +916,9 @@ operations might be disturbed.\n\n";
"$TEXMFSYSVAR/tex/generic/config/language.dat",
"$TEXMFLOCAL/tex/generic/config/language-local.dat");
+ info("running mktexlsr $TEXMFSYSVAR\n");
+ system('mktexlsr', "$TEXMFSYSVAR");
+
info("running updmap-sys\n");
system('updmap-sys', '--nohash');
@@ -1005,6 +1017,14 @@ sub do_texmf_cnf {
} else {
push @newtmf, "TEXMFSYSVAR = $vars{'TEXMFSYSVAR'}\n";
}
+ } elsif ($line =~ m/^TEXMFSYSCONFIG/) {
+ # by default TEXMFSYSCONFIG = TEXDIR/texmf-config, if this is the case
+ # we don't have to change anything from the default
+ if ("$vars{'TEXMFSYSCONFIG'}" eq "$vars{'TEXDIR'}/texmf-config") {
+ push @newtmf, $line;
+ } else {
+ push @newtmf, "TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'}\n";
+ }
} elsif ($line =~ m/^TEXMFHOME/) {
# kpse now expands ~ to USERPROFILE, so we don't treat win32 and
# unix differently