summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/utils/xindy/user-commands/xindy.in4
-rwxr-xr-xMaster/texmf/scripts/xindy/xindy.pl4
2 files changed, 8 insertions, 0 deletions
diff --git a/Build/source/utils/xindy/user-commands/xindy.in b/Build/source/utils/xindy/user-commands/xindy.in
index d1a5e2eb3ba..4d6b1f02f20 100644
--- a/Build/source/utils/xindy/user-commands/xindy.in
+++ b/Build/source/utils/xindy/user-commands/xindy.in
@@ -286,6 +286,7 @@ BEGIN {
# Determine environment. Where is our library directory, and our modules?
use File::Basename;
+use Cwd;
our ($cmd_dir, $cmd, $xindy_run, $lib_dir, $modules_dir, $path_sep);
BEGIN {
$cmd_dir = dirname($0);
@@ -337,6 +338,9 @@ BEGIN {
} else {
die "$cmd: Cannot locate xindy modules directory";
}
+ # if $cmd_dir or $lib_dir is a symlink, clisp may get confused
+ # because of relative paths above, so we resolve the path
+ $modules_dir = Cwd::realpath($modules_dir);
}
diff --git a/Master/texmf/scripts/xindy/xindy.pl b/Master/texmf/scripts/xindy/xindy.pl
index 3c0590d51fb..ffbf4bc4d9b 100755
--- a/Master/texmf/scripts/xindy/xindy.pl
+++ b/Master/texmf/scripts/xindy/xindy.pl
@@ -286,6 +286,7 @@ BEGIN {
# Determine environment. Where is our library directory, and our modules?
use File::Basename;
+use Cwd;
our ($cmd_dir, $cmd, $xindy_run, $lib_dir, $modules_dir, $path_sep);
BEGIN {
$cmd_dir = dirname($0);
@@ -337,6 +338,9 @@ BEGIN {
} else {
die "$cmd: Cannot locate xindy modules directory";
}
+ # if $cmd_dir or $lib_dir is a symlink, clisp may get confused
+ # because of relative paths above, so we resolve the path
+ $modules_dir = Cwd::realpath($modules_dir);
}