summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/tlpostcode/xetex.pl14
-rw-r--r--Master/tlpkg/tlpsrc/xetex.tlpsrc3
2 files changed, 9 insertions, 8 deletions
diff --git a/Master/tlpkg/tlpostcode/xetex.pl b/Master/tlpkg/tlpostcode/xetex.pl
index 9a47f8898ab..2ac468358e7 100644
--- a/Master/tlpkg/tlpostcode/xetex.pl
+++ b/Master/tlpkg/tlpostcode/xetex.pl
@@ -27,7 +27,7 @@ use TeXLive::TLUtils qw(win32 mkdirhier conv_to_w32_path log info);
#
# bin-installs font-config related stuff
chomp( my $texmfsysvar = `kpsewhich -var-value=TEXMFSYSVAR` ) ;
-if (-r "$texdir/bin/win32/conf/fonts.conf") {
+if (-r "$texdir/bin/win32/xetex.exe") {
# we have installed w32, so put it into texmfsysvar
mkdirhier("$texmfsysvar/fonts");
TeXLive::TLUtils::rmtree("$texmfsysvar/fonts/conf");
@@ -39,16 +39,16 @@ if (-r "$texdir/bin/win32/conf/fonts.conf") {
push @cpycmd, "cp", "-R";
}
system(@cpycmd,
- (win32() ? conv_to_w32_path("$texdir/bin/win32/conf") :
- "$texdir/bin/win32/conf"),
+ (win32() ? conv_to_w32_path("$texdir/tlpkg/tlpostcode/xetex/conf") :
+ "$texdir/tlpkg/tlpostcode/xetex/conf"),
(win32() ? conv_to_w32_path("$texmfsysvar/fonts/conf") :
"$texmfsysvar/fonts/conf"));
system(@cpycmd,
- (win32() ? conv_to_w32_path("$texdir/bin/win32/cache") :
- "$texdir/bin/win32/cache"),
+ (win32() ? conv_to_w32_path("$texdir/tlpkg/tlpostcode/xetex/cache") :
+ "$texdir/tlpkg/tlpostcode/xetex/cache"),
(win32() ? conv_to_w32_path("$texmfsysvar/fonts/cache") :
"$texmfsysvar/fonts/cache"));
- if (open(FONTSCONF, "<$texdir/bin/win32/conf/fonts.conf")) {
+ if (open(FONTSCONF, "<$texdir/tlpkg/tlpostcode/xetex/conf/fonts.conf")) {
my @lines = <FONTSCONF>;
close(FONTSCONF);
if (open(FONTSCONF, ">$texmfsysvar/fonts/conf/fonts.conf")) {
@@ -67,7 +67,7 @@ if (-r "$texdir/bin/win32/conf/fonts.conf") {
warn("Cannot open $texmfsysvar/fonts/conf/fonts.conf for writing\n");
}
} else {
- warn("Cannot open $texdir/bin/win32/conf/fonts.conf\n");
+ warn("Cannot open $texdir/tlpkg/tlpostcode/xetex/conf/fonts.conf\n");
}
}
# call fc-cache but only when we install on w32!
diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc
index 4d48995f971..c5fcb4e9343 100644
--- a/Master/tlpkg/tlpsrc/xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc
@@ -5,7 +5,8 @@ execute AddFormat name=xetex engine=xetex patterns=language.def options="-etex x
execute AddFormat name=xelatex engine=xetex patterns=language.dat options="-etex xelatex.ini"
postaction script file=tlpkg/tlpostcode/xetex.pl
runpattern f tlpkg/tlpostcode/xetex.pl
-runpattern d tlpkg/tlpostcode/xetex
+# this should only be present in the win32 binary package
+binpattern d/win32 tlpkg/tlpostcode/xetex
#
# these are only needed for darwin only, so
# use arch specific patterns to avoid warnings about not-hit patterns.