summaryrefslogtreecommitdiff
path: root/Build/source/utils/xindy/user-commands/xindy.in
diff options
context:
space:
mode:
authorVladimir Volovich <vvv@vsu.ru>2008-03-22 04:30:47 +0000
committerVladimir Volovich <vvv@vsu.ru>2008-03-22 04:30:47 +0000
commitfaaf22ece56389786d45ae6463600986eaead3a9 (patch)
tree34f14306bdff66b91d7de7b8caea0e9e0d77b690 /Build/source/utils/xindy/user-commands/xindy.in
parent1472f655976291d22dbaa4c321df214ae82d9ec3 (diff)
* instead of 3 configure options: --enable-external-clisp,
--enable-clisp-path, --enable-clisp-dir there is now only one: --with-external-clisp[=PATH] which, when used, asks to use an external clisp, which is searched in $PATH, or it is possible to supply an absolute location if it is not in $PATH. * the former --enable-clisp-dir option is removed; instead, we use a robust way to determine CLISP library directory by calling clisp -q -norc -x '(progn (princ *lib-directory*) (values))' (this is borrowed from the Meta-CVS package, referenced at http://www.niksula.cs.hut.fi/~tsiivola/clisp-ffi-howto.html) * the configure script performs better checking of clisp availability and shows proper errors when needed. * added the --enable-tetex-build option which is used for the texlive builds, and installs the files at the texlive-specific locations. added corresponding support to the user-commands scripts (xindy, xindy.v2, texindy), to allow them locate xindy.{run,mem} and runtime *.xdy modules in the texlive layout. * do not fail if clisp-link shell script exists but is not executable, as it happens in some distributions. instead, call it via "sh". git-svn-id: svn://tug.org/texlive/trunk@7067 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/xindy/user-commands/xindy.in')
-rw-r--r--Build/source/utils/xindy/user-commands/xindy.in18
1 files changed, 11 insertions, 7 deletions
diff --git a/Build/source/utils/xindy/user-commands/xindy.in b/Build/source/utils/xindy/user-commands/xindy.in
index ff91c2934e3..95c51bad479 100644
--- a/Build/source/utils/xindy/user-commands/xindy.in
+++ b/Build/source/utils/xindy/user-commands/xindy.in
@@ -294,6 +294,8 @@ BEGIN {
# library directory
if ( $ENV{XINDY_LIBDIR} ) {
$lib_dir = $ENV{XINDY_LIBDIR};
+ } elsif ( -f "$cmd_dir/xindy.run" ) { # texlive style
+ $lib_dir = $cmd_dir;
} elsif ( '@libdir@' ne '@libdir' . '@' ) { # GNU configure at work?
if ( -d '@libdir@/xindy' ) { # /usr style
$lib_dir = '@libdir@/xindy';
@@ -309,13 +311,15 @@ BEGIN {
}
# modules directory
- $modules_dir = "/usr/share/xindy";
- unless ( -d $modules_dir ) {
- #if ( -d "$cmd_dir/../modules" ) { # /opt style
- # $modules_dir = "$cmd_dir/../modules";
- #} elsif ( -d "$lib_dir/modules" ) { # /usr style
- # $modules_dir = "$lib_dir/modules";
- #} else {
+ if ( -d "$cmd_dir/../modules" ) { # /opt style
+ $modules_dir = "$cmd_dir/../modules";
+ } elsif ( -d "$lib_dir/modules" ) { # /usr style
+ $modules_dir = "$lib_dir/modules";
+ } elsif ( -d "$lib_dir/../../texmf/scripts/xindy" ) { # texlive style
+ $modules_dir = "$lib_dir/../../texmf/scripts/xindy";
+ } elsif ( -d "/usr/share/xindy" ) { # FSH style
+ $modules_dir = "/usr/share/xindy";
+ } else {
die "$cmd: Cannot locate xindy modules directory";
}
}