diff options
73 files changed, 229 insertions, 39 deletions
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in index 533ffd8627d..11f768f848d 100644 --- a/Build/source/utils/xindy/Makefile.in +++ b/Build/source/utils/xindy/Makefile.in @@ -197,6 +197,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure index 12ba249a1fa..de4147d6098 100755 --- a/Build/source/utils/xindy/configure +++ b/Build/source/utils/xindy/configure @@ -561,6 +561,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +is_TL BUILDDOCS_FALSE BUILDDOCS_TRUE BUILDRULES_FALSE @@ -4105,6 +4106,14 @@ fi ac_config_files="$ac_config_files Makefile xindy/Makefile xindy/src/Makefile xindy/tex2xindy/Makefile xindy/modules/Makefile xindy/modules/base/Makefile xindy/modules/class/Makefile xindy/modules/lang/Makefile xindy/modules/lang/german/Makefile xindy/modules/lang/latin/Makefile xindy/modules/ord/Makefile xindy/modules/rules/Makefile xindy/modules/styles/Makefile xindy/user-commands/Makefile xindy/make-rules/Makefile xindy/make-rules/alphabets/Makefile xindy/make-rules/alphabets/albanian/Makefile xindy/make-rules/alphabets/belarusian/Makefile xindy/make-rules/alphabets/bulgarian/Makefile xindy/make-rules/alphabets/croatian/Makefile xindy/make-rules/alphabets/czech/Makefile xindy/make-rules/alphabets/danish/Makefile xindy/make-rules/alphabets/dutch/Makefile xindy/make-rules/alphabets/english/Makefile xindy/make-rules/alphabets/esperanto/Makefile xindy/make-rules/alphabets/estonian/Makefile xindy/make-rules/alphabets/finnish/Makefile xindy/make-rules/alphabets/french/Makefile xindy/make-rules/alphabets/general/Makefile xindy/make-rules/alphabets/georgian/Makefile xindy/make-rules/alphabets/german/Makefile xindy/make-rules/alphabets/greek/Makefile xindy/make-rules/alphabets/gypsy/Makefile xindy/make-rules/alphabets/hausa/Makefile xindy/make-rules/alphabets/hebrew/Makefile xindy/make-rules/alphabets/hungarian/Makefile xindy/make-rules/alphabets/icelandic/Makefile xindy/make-rules/alphabets/italian/Makefile xindy/make-rules/alphabets/klingon/Makefile xindy/make-rules/alphabets/kurdish/Makefile xindy/make-rules/alphabets/latin/Makefile xindy/make-rules/alphabets/latvian/Makefile xindy/make-rules/alphabets/lithuanian/Makefile xindy/make-rules/alphabets/lower-sorbian/Makefile xindy/make-rules/alphabets/macedonian/Makefile xindy/make-rules/alphabets/mongolian/Makefile xindy/make-rules/alphabets/norwegian/Makefile xindy/make-rules/alphabets/polish/Makefile xindy/make-rules/alphabets/portuguese/Makefile xindy/make-rules/alphabets/romanian/Makefile xindy/make-rules/alphabets/russian/Makefile xindy/make-rules/alphabets/serbian/Makefile xindy/make-rules/alphabets/slovak/Makefile xindy/make-rules/alphabets/slovenian/Makefile xindy/make-rules/alphabets/spanish/Makefile xindy/make-rules/alphabets/swedish/Makefile xindy/make-rules/alphabets/test1/Makefile xindy/make-rules/alphabets/turkish/Makefile xindy/make-rules/alphabets/ukrainian/Makefile xindy/make-rules/alphabets/upper-sorbian/Makefile xindy/make-rules/alphabets/vietnamese/Makefile xindy/make-rules/inputenc/Makefile xindy/make-rules/styles/Makefile xindy/doc/Makefile xindy/doc/style-tutorial/Makefile" +# In a TeX Live build enable_texlive_build is yes, otherwise undefined. +is_TL="$enable_texlive_build" + +ac_config_files="$ac_config_files xindy/user-commands/texindy" + +ac_config_files="$ac_config_files xindy/user-commands/xindy" + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -4917,6 +4926,8 @@ do "xindy/make-rules/styles/Makefile") CONFIG_FILES="$CONFIG_FILES xindy/make-rules/styles/Makefile" ;; "xindy/doc/Makefile") CONFIG_FILES="$CONFIG_FILES xindy/doc/Makefile" ;; "xindy/doc/style-tutorial/Makefile") CONFIG_FILES="$CONFIG_FILES xindy/doc/style-tutorial/Makefile" ;; + "xindy/user-commands/texindy") CONFIG_FILES="$CONFIG_FILES xindy/user-commands/texindy" ;; + "xindy/user-commands/xindy") CONFIG_FILES="$CONFIG_FILES xindy/user-commands/xindy" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -5430,6 +5441,8 @@ $as_echo X"$file" | done } ;; + "xindy/user-commands/texindy":F) chmod +x xindy/user-commands/texindy ;; + "xindy/user-commands/xindy":F) chmod +x xindy/user-commands/xindy ;; esac done # for ac_tag diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac index b45f0d1679d..29fa7b57e09 100644 --- a/Build/source/utils/xindy/configure.ac +++ b/Build/source/utils/xindy/configure.ac @@ -203,4 +203,9 @@ AC_CONFIG_FILES([Makefile \ xindy/doc/style-tutorial/Makefile \ ]) +# In a TeX Live build enable_texlive_build is yes, otherwise undefined. +AC_SUBST([is_TL], ["$enable_texlive_build"]) +AC_CONFIG_FILES([xindy/user-commands/texindy], [chmod +x xindy/user-commands/texindy]) +AC_CONFIG_FILES([xindy/user-commands/xindy], [chmod +x xindy/user-commands/xindy]) + AC_OUTPUT diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog b/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog index cd78bf2e2df..4bad229f7a5 100644 --- a/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog +++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/ChangeLog @@ -1,3 +1,7 @@ +2010-05-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + patch-61-detect-TL (new): Better detection of TL installation. + 2010-05-11 Peter Breitenlohner <peb@mppmu.mpg.de> Imported xindy-2.4.tar.gz source tree from: diff --git a/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-61-detect-TL b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-61-detect-TL new file mode 100644 index 00000000000..11832d65aa3 --- /dev/null +++ b/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-61-detect-TL @@ -0,0 +1,117 @@ +diff -ur -N -x Makefile.in -x autom4te.cache xindy.orig/configure.ac xindy/configure.ac +--- xindy.orig/configure.ac 2010-05-11 01:12:10.000000000 +0200 ++++ xindy/configure.ac 2010-05-12 11:23:08.972502978 +0200 +@@ -162,4 +162,9 @@ + doc/style-tutorial/Makefile + ]) + ++# In a TeX Live build enable_texlive_build is yes, otherwise undefined. ++AC_SUBST([is_TL], ["$enable_texlive_build"]) ++AC_CONFIG_FILES([user-commands/texindy], [chmod +x user-commands/texindy]) ++AC_CONFIG_FILES([user-commands/xindy], [chmod +x user-commands/xindy]) ++ + AC_OUTPUT +diff -ur -N -x Makefile.in -x autom4te.cache xindy.orig/user-commands/Makefile.am xindy/user-commands/Makefile.am +--- xindy.orig/user-commands/Makefile.am 2010-05-11 01:15:51.000000000 +0200 ++++ xindy/user-commands/Makefile.am 2010-05-12 11:27:23.459084841 +0200 +@@ -26,12 +26,14 @@ + + if TEXLIVE_BUILD + ++noinst_SCRIPTS = $(scripts) ++ + scriptspath = texmf/scripts/xindy + scriptsdir = ${prefix}/$(scriptspath) + install-exec-hook: + $(MKDIR_P) "$(DESTDIR)$(scriptsdir)" + @for f in $(scripts); do \ +- $(INSTALL_SCRIPT) "$(srcdir)/$$f.in" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \ ++ $(INSTALL_SCRIPT) "$$f" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \ + done + case "$(bindir)" in \ + */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \ +@@ -57,17 +59,9 @@ + + bin_SCRIPTS += $(scripts) + +-texindy: texindy.in Makefile +- sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy +- +-xindy: xindy.in Makefile +- sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy +- + endif !TEXLIVE_BUILD + + man_MANS = texindy.1 xindy.1 + +-EXTRA_DIST = $(man_MANS) texindy.in xindy.in +- +-CLEANFILES = $(scripts) ++EXTRA_DIST = $(man_MANS) + +diff -ur -N -x Makefile.in -x autom4te.cache xindy.orig/user-commands/texindy.in xindy/user-commands/texindy.in +--- xindy.orig/user-commands/texindy.in 2010-05-11 01:39:24.000000000 +0200 ++++ xindy/user-commands/texindy.in 2010-05-12 11:09:38.891995103 +0200 +@@ -352,6 +352,7 @@ + + # Determine environment. Where is our library directory, and our modules? + ++our $is_TL = ( '@is_TL@' eq 'yes' ); + our $is_w32 = ( $OSNAME =~ /^MSWin/i ) ; + our $real_cmd = Cwd::realpath($0); + our $cmd_dir = dirname($real_cmd); +@@ -362,14 +363,8 @@ + # the actual scripts are in the library directory and have a .pl + # extension. In standalone installations, user command xindy is + # expected to be in the same directory as our command. +-# +-# FIXME: This code assumes that on TeX-Live -- and only there! -- the +-# real command has a .pl extension, this is used for detection that we +-# are on TeX-Live. This is blatantly untrue, in a standalone Windows +-# installation, xindy has also a .pl extension. We have to fix this +-# later, cleanup of this issue would delay inclusion in TL 2010. + +-if ( $real_cmd =~ /\.pl$/ ) { # TeX Live ++if ( $is_TL ) { # TeX Live + + if ( $is_w32 ) { + $xindy = "$cmd_dir/xindy.pl"; +diff -ur -N -x Makefile.in -x autom4te.cache xindy.orig/user-commands/xindy.in xindy/user-commands/xindy.in +--- xindy.orig/user-commands/xindy.in 2010-05-11 01:39:24.000000000 +0200 ++++ xindy/user-commands/xindy.in 2010-05-12 11:09:37.247697554 +0200 +@@ -337,6 +337,7 @@ + + # Determine environment. Where is our library directory, and our modules? + ++our $is_TL = ( '@is_TL@' eq 'yes' ); + our $is_w32 = ( $OSNAME =~ /^MSWin/i ) ; + our $is_windows = ( $is_w32 || $OSNAME eq 'cygwin' ) ; + our $clisp = ( $is_windows ? 'clisp.exe' : 'clisp' ) ; +@@ -354,16 +355,10 @@ + # images are located in a lib directory, modules are located in a + # share directory. + # +-# FIXME: This code assumes that on TeX-Live -- and only there! -- the +-# real command has a .pl extension, this is used for detection that we +-# are on TeX-Live. This is blatantly untrue, in a standalone Windows +-# installation, xindy has also a .pl extension. We have to fix this +-# later, cleanup of this issue would delay inclusion in TL 2010. +-# + # FIXME: In standalone installations, modules are still placed in lib + # directory. This is not conformant to FHS. + +-if ( $real_cmd =~ /\.pl$/ ) { # TeX Live ++if ( $is_TL ) { # TeX Live + + $modules_dir = Cwd::realpath("$cmd_dir/../../xindy/modules"); + die "$cmd: Cannot locate xindy modules directory" unless -d $modules_dir; +@@ -515,8 +510,7 @@ + } + + +-# Execution: Obey environment variables, create xindy start +-# expression, and eventually call it. ++# Execution: Create xindy start expression and call it. + + my $xindy_expression = xindy_expression(); # accesses global option vars + my $exit_code = call_xindy ($mem_file, $xindy_expression); diff --git a/Build/source/utils/xindy/xindy/Makefile.in b/Build/source/utils/xindy/xindy/Makefile.in index 7c6b1470bf6..b3ce279e69b 100644 --- a/Build/source/utils/xindy/xindy/Makefile.in +++ b/Build/source/utils/xindy/xindy/Makefile.in @@ -205,6 +205,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/configure.ac b/Build/source/utils/xindy/xindy/configure.ac index b4ab8a0c8a7..fd6bc130fa6 100644 --- a/Build/source/utils/xindy/xindy/configure.ac +++ b/Build/source/utils/xindy/xindy/configure.ac @@ -162,4 +162,9 @@ AC_CONFIG_FILES([Makefile \ doc/style-tutorial/Makefile ]) +# In a TeX Live build enable_texlive_build is yes, otherwise undefined. +AC_SUBST([is_TL], ["$enable_texlive_build"]) +AC_CONFIG_FILES([user-commands/texindy], [chmod +x user-commands/texindy]) +AC_CONFIG_FILES([user-commands/xindy], [chmod +x user-commands/xindy]) + AC_OUTPUT diff --git a/Build/source/utils/xindy/xindy/doc/Makefile.in b/Build/source/utils/xindy/xindy/doc/Makefile.in index b53fc03c52a..7e0cb870853 100644 --- a/Build/source/utils/xindy/xindy/doc/Makefile.in +++ b/Build/source/utils/xindy/xindy/doc/Makefile.in @@ -196,6 +196,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/doc/style-tutorial/Makefile.in b/Build/source/utils/xindy/xindy/doc/style-tutorial/Makefile.in index fe0c6129b38..8aa0aa32770 100644 --- a/Build/source/utils/xindy/xindy/doc/style-tutorial/Makefile.in +++ b/Build/source/utils/xindy/xindy/doc/style-tutorial/Makefile.in @@ -156,6 +156,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/Makefile.in index 5908b31b3f1..92c2d18d4f1 100644 --- a/Build/source/utils/xindy/xindy/make-rules/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/Makefile.in @@ -172,6 +172,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/Makefile.in index 849fc191c56..7a4d8d92507 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/Makefile.in @@ -239,6 +239,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/albanian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/albanian/Makefile.in index f5fd60dbfbe..42990435e0d 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/albanian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/albanian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/belarusian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/belarusian/Makefile.in index a9c51064805..13a457ac29e 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/belarusian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/belarusian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/bulgarian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/bulgarian/Makefile.in index eb6c84e4a2a..cc74e23984c 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/bulgarian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/bulgarian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/croatian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/croatian/Makefile.in index deedff78dc0..24bf446992a 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/croatian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/croatian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/czech/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/czech/Makefile.in index f38707a255b..36010c592ef 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/czech/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/czech/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/danish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/danish/Makefile.in index 40a48b600bc..2627af055f6 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/danish/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/danish/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/dutch/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/dutch/Makefile.in index 9af1c097c65..48b4e568215 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/dutch/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/dutch/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/english/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/english/Makefile.in index aad9c46129f..200f02029af 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/english/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/english/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/esperanto/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/esperanto/Makefile.in index 669e1875d16..973fa17d09d 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/esperanto/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/esperanto/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/estonian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/estonian/Makefile.in index 5b8bfeb5130..800aebc9381 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/estonian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/estonian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/finnish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/finnish/Makefile.in index 36d15904aff..47a74e93503 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/finnish/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/finnish/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/french/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/french/Makefile.in index bcc5defa372..1d378d0dd8e 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/french/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/french/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/general/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/general/Makefile.in index 6cffa109650..06963fc58d9 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/general/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/general/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/georgian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/georgian/Makefile.in index 48c1d24be91..d310a627ab1 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/georgian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/georgian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/german/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/german/Makefile.in index b7c7e25ad53..abba2ae58fb 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/german/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/german/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/greek/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/greek/Makefile.in index 935e3244e29..5005ce4d9ef 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/greek/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/greek/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/gypsy/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/gypsy/Makefile.in index bd22bd7bdaa..76fe4aabe3d 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/gypsy/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/gypsy/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/hausa/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/hausa/Makefile.in index a1fa738dc9e..4cae0d1b473 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/hausa/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/hausa/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/hebrew/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/hebrew/Makefile.in index 73538ec2fb5..d03a20a8ae7 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/hebrew/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/hebrew/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/hungarian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/hungarian/Makefile.in index 20a71258b1f..4d72934fa14 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/hungarian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/hungarian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/icelandic/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/icelandic/Makefile.in index 2776932819b..90708e1cc86 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/icelandic/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/icelandic/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/italian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/italian/Makefile.in index 1aa018b5018..511830a00c6 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/italian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/italian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/klingon/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/klingon/Makefile.in index d2ac96e73ca..b6614231378 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/klingon/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/klingon/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/kurdish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/kurdish/Makefile.in index 8ade34a01d7..d340dee5af4 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/kurdish/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/kurdish/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/latin/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/latin/Makefile.in index 0dc10db7305..9a1f47ba73f 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/latin/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/latin/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/latvian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/latvian/Makefile.in index 46e2c0c986b..1086efa7710 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/latvian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/latvian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/lithuanian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/lithuanian/Makefile.in index f8afb7caf21..a0c168fd984 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/lithuanian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/lithuanian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/lower-sorbian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/lower-sorbian/Makefile.in index dd6a0747e8a..b9e20145a85 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/lower-sorbian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/lower-sorbian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/macedonian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/macedonian/Makefile.in index 5ad46da70d4..87e338c395d 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/macedonian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/macedonian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/mongolian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/mongolian/Makefile.in index ca8f3aa55b5..68cde62947c 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/mongolian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/mongolian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/norwegian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/norwegian/Makefile.in index 2e87fc7b555..a272e32a60c 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/norwegian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/norwegian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/polish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/polish/Makefile.in index c2bcab82d0b..9626fa85a59 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/polish/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/polish/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/portuguese/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/portuguese/Makefile.in index 47f58d97f39..27e153fdafd 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/portuguese/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/portuguese/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/romanian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/romanian/Makefile.in index 9c3427d018b..921e69f2edf 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/romanian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/romanian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/russian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/russian/Makefile.in index aa2eed0e390..30ea56ae728 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/russian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/russian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/serbian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/serbian/Makefile.in index c1868afac7d..ec3ec214716 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/serbian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/serbian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/slovak/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/slovak/Makefile.in index e36fead24bd..c42577a08f8 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/slovak/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/slovak/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/slovenian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/slovenian/Makefile.in index 25b5a075da6..6e76b874f93 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/slovenian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/slovenian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/spanish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/spanish/Makefile.in index 07468b99013..ea309bb371b 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/spanish/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/spanish/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/swedish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/swedish/Makefile.in index 8682f0c74da..547870fa840 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/swedish/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/swedish/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/test1/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/test1/Makefile.in index d6440e2b373..3ea64ddf124 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/test1/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/test1/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/turkish/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/turkish/Makefile.in index 11913af0221..5f0fe8a6c17 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/turkish/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/turkish/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/ukrainian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/ukrainian/Makefile.in index 8f92ca22804..2d501388f74 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/ukrainian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/ukrainian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/upper-sorbian/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/upper-sorbian/Makefile.in index d9de7f3efa5..8833bc510c0 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/upper-sorbian/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/upper-sorbian/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/alphabets/vietnamese/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/alphabets/vietnamese/Makefile.in index 8c0c671ef20..16371493825 100644 --- a/Build/source/utils/xindy/xindy/make-rules/alphabets/vietnamese/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/alphabets/vietnamese/Makefile.in @@ -132,6 +132,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/inputenc/Makefile.in index cc5f7bbccd4..632a4e1b54d 100644 --- a/Build/source/utils/xindy/xindy/make-rules/inputenc/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/inputenc/Makefile.in @@ -156,6 +156,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/make-rules/styles/Makefile.in b/Build/source/utils/xindy/xindy/make-rules/styles/Makefile.in index 72f1251175e..0aa93e4c462 100644 --- a/Build/source/utils/xindy/xindy/make-rules/styles/Makefile.in +++ b/Build/source/utils/xindy/xindy/make-rules/styles/Makefile.in @@ -156,6 +156,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/modules/Makefile.in b/Build/source/utils/xindy/xindy/modules/Makefile.in index dc6768d4259..9cbe1581004 100644 --- a/Build/source/utils/xindy/xindy/modules/Makefile.in +++ b/Build/source/utils/xindy/xindy/modules/Makefile.in @@ -172,6 +172,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/modules/base/Makefile.in b/Build/source/utils/xindy/xindy/modules/base/Makefile.in index 605c6bc801a..ec0c89af9e5 100644 --- a/Build/source/utils/xindy/xindy/modules/base/Makefile.in +++ b/Build/source/utils/xindy/xindy/modules/base/Makefile.in @@ -156,6 +156,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/modules/class/Makefile.in b/Build/source/utils/xindy/xindy/modules/class/Makefile.in index 5d0ffd0edd8..f113290e082 100644 --- a/Build/source/utils/xindy/xindy/modules/class/Makefile.in +++ b/Build/source/utils/xindy/xindy/modules/class/Makefile.in @@ -156,6 +156,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/modules/lang/Makefile.in b/Build/source/utils/xindy/xindy/modules/lang/Makefile.in index 933dd3dd25d..125383cac1c 100644 --- a/Build/source/utils/xindy/xindy/modules/lang/Makefile.in +++ b/Build/source/utils/xindy/xindy/modules/lang/Makefile.in @@ -172,6 +172,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/modules/lang/german/Makefile.in b/Build/source/utils/xindy/xindy/modules/lang/german/Makefile.in index 04b25f1209a..70f181c7771 100644 --- a/Build/source/utils/xindy/xindy/modules/lang/german/Makefile.in +++ b/Build/source/utils/xindy/xindy/modules/lang/german/Makefile.in @@ -156,6 +156,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/modules/lang/latin/Makefile.in b/Build/source/utils/xindy/xindy/modules/lang/latin/Makefile.in index 41d2a274bea..5643f640fbc 100644 --- a/Build/source/utils/xindy/xindy/modules/lang/latin/Makefile.in +++ b/Build/source/utils/xindy/xindy/modules/lang/latin/Makefile.in @@ -156,6 +156,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/modules/ord/Makefile.in b/Build/source/utils/xindy/xindy/modules/ord/Makefile.in index 4c487763592..ba0310516c6 100644 --- a/Build/source/utils/xindy/xindy/modules/ord/Makefile.in +++ b/Build/source/utils/xindy/xindy/modules/ord/Makefile.in @@ -156,6 +156,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/modules/rules/Makefile.in b/Build/source/utils/xindy/xindy/modules/rules/Makefile.in index 52088f956ea..65762417e57 100644 --- a/Build/source/utils/xindy/xindy/modules/rules/Makefile.in +++ b/Build/source/utils/xindy/xindy/modules/rules/Makefile.in @@ -156,6 +156,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/modules/styles/Makefile.in b/Build/source/utils/xindy/xindy/modules/styles/Makefile.in index c99e0fe81e3..efaac54a7fc 100644 --- a/Build/source/utils/xindy/xindy/modules/styles/Makefile.in +++ b/Build/source/utils/xindy/xindy/modules/styles/Makefile.in @@ -156,6 +156,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/src/Makefile.in b/Build/source/utils/xindy/xindy/src/Makefile.in index 8cd29769801..cf7ffd19995 100644 --- a/Build/source/utils/xindy/xindy/src/Makefile.in +++ b/Build/source/utils/xindy/xindy/src/Makefile.in @@ -156,6 +156,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/tex2xindy/Makefile.in b/Build/source/utils/xindy/xindy/tex2xindy/Makefile.in index fee495227d3..dbb88d850c7 100644 --- a/Build/source/utils/xindy/xindy/tex2xindy/Makefile.in +++ b/Build/source/utils/xindy/xindy/tex2xindy/Makefile.in @@ -176,6 +176,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/Build/source/utils/xindy/xindy/user-commands/Makefile.am b/Build/source/utils/xindy/xindy/user-commands/Makefile.am index e73a7c404d6..38cbe3349ec 100644 --- a/Build/source/utils/xindy/xindy/user-commands/Makefile.am +++ b/Build/source/utils/xindy/xindy/user-commands/Makefile.am @@ -26,12 +26,14 @@ bin_SCRIPTS = if TEXLIVE_BUILD +noinst_SCRIPTS = $(scripts) + scriptspath = texmf/scripts/xindy scriptsdir = ${prefix}/$(scriptspath) install-exec-hook: $(MKDIR_P) "$(DESTDIR)$(scriptsdir)" @for f in $(scripts); do \ - $(INSTALL_SCRIPT) "$(srcdir)/$$f.in" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \ + $(INSTALL_SCRIPT) "$$f" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \ done case "$(bindir)" in \ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \ @@ -57,17 +59,9 @@ else !TEXLIVE_BUILD bin_SCRIPTS += $(scripts) -texindy: texindy.in Makefile - sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy - -xindy: xindy.in Makefile - sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy - endif !TEXLIVE_BUILD man_MANS = texindy.1 xindy.1 -EXTRA_DIST = $(man_MANS) texindy.in xindy.in - -CLEANFILES = $(scripts) +EXTRA_DIST = $(man_MANS) diff --git a/Build/source/utils/xindy/xindy/user-commands/Makefile.in b/Build/source/utils/xindy/xindy/user-commands/Makefile.in index 63fc7d40449..ee6a2139f1e 100644 --- a/Build/source/utils/xindy/xindy/user-commands/Makefile.in +++ b/Build/source/utils/xindy/xindy/user-commands/Makefile.in @@ -35,7 +35,8 @@ build_triplet = @build@ host_triplet = @host@ @TEXLIVE_BUILD_FALSE@am__append_1 = $(scripts) subdir = xindy/user-commands -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/texindy.in $(srcdir)/xindy.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/xindy/VERSION $(top_srcdir)/ac/xindy.ac \ @@ -43,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = texindy xindy CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -67,7 +68,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" -SCRIPTS = $(bin_SCRIPTS) +SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS) SOURCES = DIST_SOURCES = man1dir = $(mandir)/man1 @@ -160,6 +161,7 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +is_TL = @is_TL@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -182,11 +184,11 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ scripts = texindy xindy bin_SCRIPTS = $(am__append_1) +@TEXLIVE_BUILD_TRUE@noinst_SCRIPTS = $(scripts) @TEXLIVE_BUILD_TRUE@scriptspath = texmf/scripts/xindy @TEXLIVE_BUILD_TRUE@scriptsdir = ${prefix}/$(scriptspath) man_MANS = texindy.1 xindy.1 -EXTRA_DIST = $(man_MANS) texindy.in xindy.in -CLEANFILES = $(scripts) +EXTRA_DIST = $(man_MANS) all: all-am .SUFFIXES: @@ -220,6 +222,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +texindy: $(top_builddir)/config.status $(srcdir)/texindy.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +xindy: $(top_builddir)/config.status $(srcdir)/xindy.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @@ -366,7 +372,6 @@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -465,7 +470,7 @@ uninstall-man: uninstall-man1 @TEXLIVE_BUILD_TRUE@install-exec-hook: @TEXLIVE_BUILD_TRUE@ $(MKDIR_P) "$(DESTDIR)$(scriptsdir)" @TEXLIVE_BUILD_TRUE@ @for f in $(scripts); do \ -@TEXLIVE_BUILD_TRUE@ $(INSTALL_SCRIPT) "$(srcdir)/$$f.in" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \ +@TEXLIVE_BUILD_TRUE@ $(INSTALL_SCRIPT) "$$f" "$(DESTDIR)$(scriptsdir)/$$f.pl"; \ @TEXLIVE_BUILD_TRUE@ done @TEXLIVE_BUILD_TRUE@ case "$(bindir)" in \ @TEXLIVE_BUILD_TRUE@ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \ @@ -487,12 +492,6 @@ uninstall-man: uninstall-man1 @TEXLIVE_BUILD_TRUE@ rm -f "$(DESTDIR)$(scriptsdir)/$$f.pl"; \ @TEXLIVE_BUILD_TRUE@ done -@TEXLIVE_BUILD_FALSE@texindy: texindy.in Makefile -@TEXLIVE_BUILD_FALSE@ sed -e 's:@libdir\@:$(libdir):' $(srcdir)/texindy.in >texindy - -@TEXLIVE_BUILD_FALSE@xindy: xindy.in Makefile -@TEXLIVE_BUILD_FALSE@ sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/Build/source/utils/xindy/xindy/user-commands/texindy.in b/Build/source/utils/xindy/xindy/user-commands/texindy.in index f2c3dae1652..740b612d5e2 100644 --- a/Build/source/utils/xindy/xindy/user-commands/texindy.in +++ b/Build/source/utils/xindy/xindy/user-commands/texindy.in @@ -352,6 +352,7 @@ use Getopt::Long qw(:config bundling); # Determine environment. Where is our library directory, and our modules? +our $is_TL = ( '@is_TL@' eq 'yes' ); our $is_w32 = ( $OSNAME =~ /^MSWin/i ) ; our $real_cmd = Cwd::realpath($0); our $cmd_dir = dirname($real_cmd); @@ -362,14 +363,8 @@ our $xindy; # the actual scripts are in the library directory and have a .pl # extension. In standalone installations, user command xindy is # expected to be in the same directory as our command. -# -# FIXME: This code assumes that on TeX-Live -- and only there! -- the -# real command has a .pl extension, this is used for detection that we -# are on TeX-Live. This is blatantly untrue, in a standalone Windows -# installation, xindy has also a .pl extension. We have to fix this -# later, cleanup of this issue would delay inclusion in TL 2010. -if ( $real_cmd =~ /\.pl$/ ) { # TeX Live +if ( $is_TL ) { # TeX Live if ( $is_w32 ) { $xindy = "$cmd_dir/xindy.pl"; diff --git a/Build/source/utils/xindy/xindy/user-commands/xindy.in b/Build/source/utils/xindy/xindy/user-commands/xindy.in index 09a6d3984d2..e594861a539 100644 --- a/Build/source/utils/xindy/xindy/user-commands/xindy.in +++ b/Build/source/utils/xindy/xindy/user-commands/xindy.in @@ -337,6 +337,7 @@ use POSIX qw(uname); # Determine environment. Where is our library directory, and our modules? +our $is_TL = ( '@is_TL@' eq 'yes' ); our $is_w32 = ( $OSNAME =~ /^MSWin/i ) ; our $is_windows = ( $is_w32 || $OSNAME eq 'cygwin' ) ; our $clisp = ( $is_windows ? 'clisp.exe' : 'clisp' ) ; @@ -354,16 +355,10 @@ our ($lib_dir, $modules_dir); # images are located in a lib directory, modules are located in a # share directory. # -# FIXME: This code assumes that on TeX-Live -- and only there! -- the -# real command has a .pl extension, this is used for detection that we -# are on TeX-Live. This is blatantly untrue, in a standalone Windows -# installation, xindy has also a .pl extension. We have to fix this -# later, cleanup of this issue would delay inclusion in TL 2010. -# # FIXME: In standalone installations, modules are still placed in lib # directory. This is not conformant to FHS. -if ( $real_cmd =~ /\.pl$/ ) { # TeX Live +if ( $is_TL ) { # TeX Live $modules_dir = Cwd::realpath("$cmd_dir/../../xindy/modules"); die "$cmd: Cannot locate xindy modules directory" unless -d $modules_dir; @@ -515,8 +510,7 @@ unless ( $interactive ) { } -# Execution: Obey environment variables, create xindy start -# expression, and eventually call it. +# Execution: Create xindy start expression and call it. my $xindy_expression = xindy_expression(); # accesses global option vars my $exit_code = call_xindy ($mem_file, $xindy_expression); |