diff options
Diffstat (limited to 'Master/texmf/scripts/xindy/xindy.pl')
-rwxr-xr-x | Master/texmf/scripts/xindy/xindy.pl | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/Master/texmf/scripts/xindy/xindy.pl b/Master/texmf/scripts/xindy/xindy.pl index ffbf4bc4d9b..9a7b0579845 100755 --- a/Master/texmf/scripts/xindy/xindy.pl +++ b/Master/texmf/scripts/xindy/xindy.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: xindy.pl,v 1.8 2006/07/30 10:30:42 jschrod Exp $ +# $Id: xindy.pl,v 1.11 2009/03/22 11:08:18 jschrod Exp $ #------------------------------------------------------------ # (history at end) @@ -64,7 +64,7 @@ output usage message with options explanation. Don't output progress messages. Output only error messages. -=item C<--version> / B<-v> +=item C<--verbose> / B<-v> Output verbose progress messages. @@ -276,7 +276,7 @@ use strict; BEGIN { use vars qw($Revision $VERSION); - q$Revision: 1.8 $ =~ /: (\d+)\.(\d+)/ ; # q wg. Emacs indent! + q$Revision: 1.11 $ =~ /: (\d+)\.(\d+)/ ; # q wg. Emacs indent! my ($major, $minor) = ($1, $2); $VERSION = "$major." . ($minor<10 ? '0' : '') . $minor; } @@ -309,11 +309,11 @@ BEGIN { } elsif ( exists $ENV{"SELFAUTOLOC"} && -f "$ENV{SELFAUTOLOC}/$xindy_run" ) { # texlive woe32 $lib_dir = $ENV{"SELFAUTOLOC"}; $cmd_dir = $ENV{"SELFAUTOLOC"}; - } elsif ( '/home/vvv/src/tex/texlive/source/utils/01/lib' ne '@libdir' . '@' ) { # GNU configure at work? - if ( -d '/home/vvv/src/tex/texlive/source/utils/01/lib/xindy' ) { # /usr style - $lib_dir = '/home/vvv/src/tex/texlive/source/utils/01/lib/xindy'; + } elsif ( '@libdir@' ne '@libdir' . '@' ) { # GNU configure at work? + if ( -d '@libdir@/xindy' ) { # /usr style + $lib_dir = '@libdir@/xindy'; } else { - $lib_dir = '/home/vvv/src/tex/texlive/source/utils/01/lib'; # /opt style + $lib_dir = '@libdir@'; # /opt style } die "$cmd: Cannot locate $lib_dir/$xindy_run" if ! -f "$lib_dir/$xindy_run"; } elsif ( -f "$cmd_dir/../lib/$xindy_run" ) { # /opt style @@ -656,7 +656,7 @@ sub xindy_expression () { if ( $2 && -d "$ld/$1" ) { # $2 is not set if the regex didn't match $language = $1; $variant = "$2-" unless ( $2 eq 'iso' ); - $variant =~ s/din/din5007/ ; + $variant eq 'din' and $variant = 'din5007'; } } # Let's guess the codepage. We take any that starts with @@ -806,6 +806,16 @@ sub quotify ( $ ) { #====================================================================== # # $Log: xindy.pl,v $ +# Revision 1.11 2009/03/22 11:08:18 jschrod +# man page: --v is --verbose, not --version. +# +# Revision 1.10 2009/03/21 18:05:11 jschrod +# Variant rename of din to din5007 made explicit. (Proposed by +# Zdenek Wagner at 16 Mar 09.) +# +# Revision 1.9 2008/02/17 14:55:32 jschrod +# Use exitcode 0 when usage is explicitly demanded with --help et.al. +# # Revision 1.8 2006/07/30 10:30:42 jschrod # Check if an exec() error happened and output an error message. # (Ticket 1230801) |