summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-06-29 06:59:27 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-06-29 06:59:27 +0000
commit40121f1e15ccbf0b4ef822eef9442aa985c2bc45 (patch)
tree300790b1eea417ecfc884b5286755e5d8919a27c /Master
parent1e63d4e6e18252945668a8f2aabe05737e1fc068 (diff)
xindy:pl: Sync with MikTeX.
git-svn-id: svn://tug.org/texlive/trunk@37705 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf-dist/scripts/xindy/xindy.pl14
1 files changed, 11 insertions, 3 deletions
diff --git a/Master/texmf-dist/scripts/xindy/xindy.pl b/Master/texmf-dist/scripts/xindy/xindy.pl
index 8eca24fd9c4..e6f3f6febb4 100755
--- a/Master/texmf-dist/scripts/xindy/xindy.pl
+++ b/Master/texmf-dist/scripts/xindy/xindy.pl
@@ -394,7 +394,7 @@ $TMPDIR = ".";
# FIXME: In standalone installations, modules are still placed in lib
# directory. This is not conformant to FHS.
-if ( $is_TL ) { # TeX Live and MikTeX
+if ( $is_TL ) { # TeX Live, MiKTeX, or W32TeX
$modules_dir = Cwd::realpath("$cmd_dir/../../xindy/modules");
die "$cmd: Cannot locate xindy modules directory" unless -d $modules_dir;
@@ -402,8 +402,12 @@ if ( $is_TL ) { # TeX Live and MikTeX
if ( $is_w32 ) {
if ( -d "$cmd_dir/../../../bin/win32" ) { # TeX Live
$cmd_dir = "$cmd_dir/../../../bin/win32";
- } elsif ( -d "$cmd_dir/../../miktex/bin" ) { # MikTeX
- $cmd_dir = "$cmd_dir/../../miktex/bin";
+ } elsif ( -d "$cmd_dir/../../miktex/bin/x64/internal" ) { # MiKTeX 64-bit
+ $cmd_dir = "$cmd_dir/../../miktex/bin/x64/internal";
+ } elsif ( -d "$cmd_dir/../../miktex/bin/internal" ) { # MiKTeX 32-bit
+ $cmd_dir = "$cmd_dir/../../miktex/bin/internal";
+ } elsif ( -d "$cmd_dir/../../../../bin" ) { # W32TeX
+ $cmd_dir = "$cmd_dir/../../../../bin";
} else {
die "$cmd: Cannot locate bin directory";
}
@@ -626,7 +630,11 @@ sub parse_options() {
usage(1);
}
my ($name, $path, $suffix) = fileparse ($ARGV[0], '\.[^\.]+');
+ if ($path eq ".\\") {
+ $outfile = "$name.ind";
+ } else {
$outfile = "$path$name.ind";
+ }
}
# FIXME: xindy wants a log file. Really?