diff options
| author | Vladimir Volovich <vvv@vsu.ru> | 2008-03-18 00:02:58 +0000 |
|---|---|---|
| committer | Vladimir Volovich <vvv@vsu.ru> | 2008-03-18 00:02:58 +0000 |
| commit | 9a14b4aedac86983ddd640e7c376bdcf09e6753d (patch) | |
| tree | 668f20738f57c2cd306ff015da0f55231df2f3d5 /Build/source/utils/xindy/user-commands/xindy.in | |
| parent | abdd2d2892b5ee0071ef7bf1a387251d74e78055 (diff) | |
applied patched from the debian package xindy_2.3-1:
latex-call.dpatch
fix-echo-expansion.dpatch
fix-FHS.dpatch
help-option.dpatch
fix-stdout.dpatch
fix-manpages.dpatch
git-svn-id: svn://tug.org/texlive/trunk@7004 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.in | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Build/source/utils/xindy/user-commands/xindy.in b/Build/source/utils/xindy/user-commands/xindy.in index ce770275cd0..ff91c2934e3 100644 --- a/Build/source/utils/xindy/user-commands/xindy.in +++ b/Build/source/utils/xindy/user-commands/xindy.in @@ -309,11 +309,13 @@ BEGIN { } # modules directory - 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 { + $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 { die "$cmd: Cannot locate xindy modules directory"; } } @@ -333,9 +335,7 @@ use File::Spec; # second-to-last has the extension ".xdy". Then, call the old driver # script with the original arguments... -sub usage () -{ - print STDERR <<_EOT_ +my $usage_msg = <<_EOT_ usage: $cmd [-V?h] [-qv] [-d magic] [-o outfile.ind] [-t log] \\ [-L lang] [-C codepage] [-M module] [-I input] \\ @@ -358,7 +358,11 @@ GNU-STYLE LONG OPTIONS FOR SHORT OPTIONS: -I / --input-markup (supported: latex, omega, xindy) _EOT_ - ; +; + +sub usage () +{ + print STDERR $usage_msg; exit 1; } @@ -431,7 +435,7 @@ sub parse_options() { GetOptions( 'version|V' => sub { output_version(0); }, 'internal-version' => sub { output_version(1); }, - 'help|h|?' => \&usage, + 'help|h|?' => sub { print $usage_msg; exit 0; }, 'quiet|q' => \$quiet, 'verbose|v' => \$verbose, 'debug|d=s' => \@debug, |