diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-06-30 06:54:41 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-06-30 06:54:41 +0000 |
| commit | 6d0fc7dc62ac9a3072c56990c9c7ec34413bfc4e (patch) | |
| tree | 80481c89ac00e800cc9ce993c046d0220733e7e6 /Build/source/utils | |
| parent | 17c6f6f330816d9a862491c5bcb35e9cf1888779 (diff) | |
utils/xindy: Support spaces in paths
git-svn-id: svn://tug.org/texlive/trunk@37716 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
4 files changed, 14 insertions, 7 deletions
diff --git a/Build/source/utils/xindy/xindy-2.5.1-PATCHES/ChangeLog b/Build/source/utils/xindy/xindy-2.5.1-PATCHES/ChangeLog index 478047cc3e1..f02ab62d6a0 100644 --- a/Build/source/utils/xindy/xindy-2.5.1-PATCHES/ChangeLog +++ b/Build/source/utils/xindy/xindy-2.5.1-PATCHES/ChangeLog @@ -1,3 +1,7 @@ +2014-10-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-02-win32-paths-with-spaces: Quotify lang_dir. + 2014-10-29 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-02-win32-paths-with-spaces: Sync with MikTeX. diff --git a/Build/source/utils/xindy/xindy-2.5.1-PATCHES/patch-02-win32-paths-with-spaces b/Build/source/utils/xindy/xindy-2.5.1-PATCHES/patch-02-win32-paths-with-spaces index d54ada1138f..16ef575fc03 100644 --- a/Build/source/utils/xindy/xindy-2.5.1-PATCHES/patch-02-win32-paths-with-spaces +++ b/Build/source/utils/xindy/xindy-2.5.1-PATCHES/patch-02-win32-paths-with-spaces @@ -1,6 +1,6 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xindy.1 xindy-2.5.1/user-commands/xindy.1 --- xindy-2.5.1.orig/user-commands/xindy.1 2014-05-29 22:26:05.000000000 +0200 -+++ xindy-2.5.1/user-commands/xindy.1 2015-06-29 10:02:12.000000000 +0200 ++++ xindy-2.5.1/user-commands/xindy.1 2015-06-30 08:43:32.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) @@ -12,13 +12,13 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xind .\" .IX Title "xindy 1" -.TH xindy 1 "2014-05-29" "Release 2.5.1" "xindy" -+.TH xindy 1 "2015-06-29" "Release 2.5.1" "xindy" ++.TH xindy 1 "2015-06-30" "Release 2.5.1" "xindy" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xindy.in xindy-2.5.1/user-commands/xindy.in --- xindy-2.5.1.orig/user-commands/xindy.in 2014-10-24 10:38:47.000000000 +0200 -+++ xindy-2.5.1/user-commands/xindy.in 2015-06-29 10:02:00.000000000 +0200 ++++ xindy-2.5.1/user-commands/xindy.in 2015-06-30 08:43:25.000000000 +0200 @@ -394,7 +394,7 @@ # FIXME: In standalone installations, modules are still placed in lib # directory. This is not conformant to FHS. @@ -63,12 +63,14 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xind print "Running filter: $filter <$input >$output\n" if $verbose; system "$filter <$input >$output"; print "filtered xindy input file: $output\n" if $debug{script}; -@@ -765,7 +774,7 @@ +@@ -764,8 +773,9 @@ + # "latin", "cp", "iso8859", "ascii", or "utf8". @codepages = qw(latin cp iso8859 ascii utf8) unless @codepages; my @styles; ++ my $quotified_lang_dir = quotify($lang_dir); foreach my $cp ( @codepages ) { - @styles = glob("$lang_dir/$variant$cp*-lang.xdy"); -+ @styles = glob("'$lang_dir/$variant$cp*-lang.xdy'"); ++ @styles = glob("$quotified_lang_dir/$variant$cp*-lang.xdy"); last if @styles; } unless ( @styles ) { diff --git a/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.1 b/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.1 index 9f96b205cb0..983541b3e49 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.1 +++ b/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "xindy 1" -.TH xindy 1 "2015-06-29" "Release 2.5.1" "xindy" +.TH xindy 1 "2015-06-30" "Release 2.5.1" "xindy" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.in b/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.in index 50104cad47c..91f2834da58 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.in +++ b/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.in @@ -773,8 +773,9 @@ sub xindy_expression () { # "latin", "cp", "iso8859", "ascii", or "utf8". @codepages = qw(latin cp iso8859 ascii utf8) unless @codepages; my @styles; + my $quotified_lang_dir = quotify($lang_dir); foreach my $cp ( @codepages ) { - @styles = glob("'$lang_dir/$variant$cp*-lang.xdy'"); + @styles = glob("$quotified_lang_dir/$variant$cp*-lang.xdy"); last if @styles; } unless ( @styles ) { |