summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Volovich <vvv@vsu.ru>2008-04-06 18:53:53 +0000
committerVladimir Volovich <vvv@vsu.ru>2008-04-06 18:53:53 +0000
commitad9675b6c07a3384760e1acd6aec0c141e1e9134 (patch)
tree2515fda2d4705e99431ef8738495a89af8155527
parent320a8db19049b2f80922143eae02c4150b66a139 (diff)
autoreconf
git-svn-id: svn://tug.org/texlive/trunk@7337 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/utils/xindy/Makefile.in3
-rw-r--r--Build/source/utils/xindy/binaries/Makefile.in20
-rwxr-xr-xBuild/source/utils/xindy/configure21
-rw-r--r--Build/source/utils/xindy/doc/Makefile.in3
-rw-r--r--Build/source/utils/xindy/doc/style-tutorial/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/inputenc/Makefile.in3
-rw-r--r--Build/source/utils/xindy/make-rules/styles/Makefile.in3
-rw-r--r--Build/source/utils/xindy/modules/Makefile.in3
-rw-r--r--Build/source/utils/xindy/modules/base/Makefile.in3
-rw-r--r--Build/source/utils/xindy/modules/class/Makefile.in3
-rw-r--r--Build/source/utils/xindy/modules/lang/Makefile.in3
-rw-r--r--Build/source/utils/xindy/modules/lang/german/Makefile.in3
-rw-r--r--Build/source/utils/xindy/modules/lang/latin/Makefile.in3
-rw-r--r--Build/source/utils/xindy/modules/ord/Makefile.in3
-rw-r--r--Build/source/utils/xindy/modules/rules/Makefile.in3
-rw-r--r--Build/source/utils/xindy/modules/styles/Makefile.in3
-rw-r--r--Build/source/utils/xindy/rte/Makefile.in13
-rw-r--r--Build/source/utils/xindy/rte/ordrules/Makefile.in9
-rw-r--r--Build/source/utils/xindy/src/Makefile.in3
-rw-r--r--Build/source/utils/xindy/tex2xindy/Makefile.in3
-rw-r--r--Build/source/utils/xindy/user-commands/Makefile.in3
68 files changed, 168 insertions, 87 deletions
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index ea2a79cbefb..5d6c1b0fe1b 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -94,7 +94,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -117,6 +116,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -133,6 +133,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/binaries/Makefile.in b/Build/source/utils/xindy/binaries/Makefile.in
index 1125d8d48f4..b9fbe8a205f 100644
--- a/Build/source/utils/xindy/binaries/Makefile.in
+++ b/Build/source/utils/xindy/binaries/Makefile.in
@@ -67,7 +67,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -90,6 +89,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -106,6 +106,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -164,7 +165,7 @@ FAS = base.fas locref.fas idxstyle.fas index.fas version.fas markup.fas
DEFAULTS = defaults.xdy
DUMP_XINDY = $(SRCDIR)/dump-xindy.lsp
MEMFILE = xindy.mem
-XINDY_RUN = ./xindy.run -q -M ./base.mem
+RUN_XINDY = ./$(XINDY_RUN) -q -norc -M ./base.mem
# Where the modules are found at runtime.
@TETEX_BUILD_FALSE@MODULEDIR = $(pkgdatadir)
@TETEX_BUILD_TRUE@MODULEDIR = $(prefix)/texmf/xindy
@@ -175,10 +176,9 @@ XINDY_RUN = ./xindy.run -q -M ./base.mem
# *.lib files which should be cleaned
FASLIBS = base.lib locref.lib idxstyle.lib index.lib version.lib markup.lib
kernel_DATA = xindy.mem
-kernel_SCRIPTS = xindy.run
-CLEANFILES = $(FAS) $(FASLIBS) defaults.xdy base.mem \
- $(kernel_DATA) $(kernel_SCRIPTS)
-
+kernel_SCRIPTS = $(XINDY_RUN)
+EXTRA_SCRIPTS = xindy.run xindy-lisp.exe
+CLEANFILES = $(FAS) $(FASLIBS) defaults.xdy base.mem xindy.mem $(XINDY_RUN)
all: all-am
.SUFFIXES:
@@ -381,9 +381,9 @@ uninstall-am: uninstall-kernelDATA uninstall-kernelSCRIPTS
uninstall-kernelDATA uninstall-kernelSCRIPTS
-xindy.mem: $(DEFAULTS) $(FAS) base.mem xindy.run
+xindy.mem: $(DEFAULTS) $(FAS) base.mem $(XINDY_RUN)
rm -f $(MEMFILE)
- $(XINDY_RUN) -x '(load "$(DUMP_XINDY)")'
+ $(RUN_XINDY) -x '(load "$(DUMP_XINDY)")'
gzip $(MEMFILE)
mv $(MEMFILE).gz $(MEMFILE)
@@ -395,8 +395,8 @@ $(DEFAULTS):
@echo " (pathname \"$(MODULEDIR)\")))" >> $(DEFAULTS)
@echo "Finished $(DEFAULTS)."
-%.fas : $(SRCDIR)/%.lsp
- $(XINDY_RUN) -c $< -o $@
+%.fas: $(SRCDIR)/%.lsp
+ $(RUN_XINDY) -c $< -o $@
# 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/configure b/Build/source/utils/xindy/configure
index 2717787123d..0b6d86a95b7 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -705,6 +705,8 @@ BUILDDOCS_TRUE
BUILDDOCS_FALSE
CLISP
CLISP_LIB
+XINDY_RUN
+LISP_RUN
CPP
GREP
EGREP
@@ -3977,6 +3979,17 @@ fi
+
+if test "x$EXEEXT" = "x.exe"; then
+ XINDY_RUN=xindy-lisp.exe
+ LISP_RUN=lisp.exe
+else
+ XINDY_RUN=xindy.run
+ LISP_RUN=lisp.run
+fi
+
+
+
# Checks for libraries.
# Checks for header files.
@@ -5792,12 +5805,12 @@ BUILDDOCS_TRUE!$BUILDDOCS_TRUE$ac_delim
BUILDDOCS_FALSE!$BUILDDOCS_FALSE$ac_delim
CLISP!$CLISP$ac_delim
CLISP_LIB!$CLISP_LIB$ac_delim
+XINDY_RUN!$XINDY_RUN$ac_delim
+LISP_RUN!$LISP_RUN$ac_delim
CPP!$CPP$ac_delim
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -5839,6 +5852,8 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
build_os!$build_os$ac_delim
host!$host$ac_delim
host_cpu!$host_cpu$ac_delim
@@ -5848,7 +5863,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/Build/source/utils/xindy/doc/Makefile.in b/Build/source/utils/xindy/doc/Makefile.in
index 67fdb99a55a..373013ac528 100644
--- a/Build/source/utils/xindy/doc/Makefile.in
+++ b/Build/source/utils/xindy/doc/Makefile.in
@@ -77,7 +77,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -100,6 +99,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -116,6 +116,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/doc/style-tutorial/Makefile.in b/Build/source/utils/xindy/doc/style-tutorial/Makefile.in
index eef8cd75a3e..5afecd2c507 100644
--- a/Build/source/utils/xindy/doc/style-tutorial/Makefile.in
+++ b/Build/source/utils/xindy/doc/style-tutorial/Makefile.in
@@ -64,7 +64,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -87,6 +86,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -103,6 +103,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/Makefile.in b/Build/source/utils/xindy/make-rules/Makefile.in
index cd802faa713..74f6fe268b5 100644
--- a/Build/source/utils/xindy/make-rules/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/Makefile.in
@@ -66,7 +66,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -89,6 +88,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -105,6 +105,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
index 4ca96cb722e..aac760bc703 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
@@ -164,7 +164,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -187,6 +186,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -203,6 +203,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in
index a5d02e96b6d..22f1f91184a 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in
index 63604221de1..22a263bbed5 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in
index 6f13960d09c..3b653abf210 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in
index 0f056178e42..828ef8bbdb1 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in
index 2ec62eae733..f377d878e16 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in
index 3bc7bdd0113..1300bc2fa86 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in
index d2b88c8b4fe..faa2317af31 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in
index 1c81c8ce5df..23a183f0f9a 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in
index f82bebf9af0..ee5a0cd4f6e 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in
index c9d209fe5cc..666ea309614 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in
index 053aa2bf38a..9cc7668e0c5 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in
index 2d15a9c9e23..03534305768 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in
index 4a7d0e274c3..b0bf2d3109e 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in
index 53981d8e60b..53a7d4087cc 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in
index d0d4ad934eb..9777bc94db8 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in
index 8fd800539e2..1197d0aefd1 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in
index 1eedf5e71ae..4ad7b4da98a 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in
index 2c1b380b7db..c82ca9ce04c 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in
index 8b5c619dbc7..6a2cfd2ae5e 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in
index 500cf9de361..63a49b3f363 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in
index 3e0d360c8c9..26272e9b32b 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in
index afddb885fd3..985168cc1ce 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in
index 09dde69d8b2..62eca7d4ee0 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in
index c4513f0a186..fb68d54f9ee 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in
index f9e7aa4e9ca..f105d87c40a 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in
index 79222c9a28a..96ca45a9872 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in
index 27aa29a4fb9..5720239627a 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in
index 9e5707449a2..f8345702b42 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/lower-sorbian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in
index bfa3b005bbb..c43f79004ad 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in
index b95c0258c6a..8422cd99978 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in
index 3135523a657..b5125412186 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in
index b28f3e66783..a20434fc3f0 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in
index 27dea344f4a..aa1b2d0eaa5 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in
index 99b55e4dd5f..5afc306f159 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in
index 6f28fbed6a8..bfba9590933 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in
index a0218676181..17d7cc579c4 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in
index 3fbc4f341a6..49eea324767 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in
index 88131e2bc9c..916ea99cbea 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in
index 8fcdaa4a3fe..33e2d33f581 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in
index ccb5ed52841..eff1ac414ab 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in
index 41b57d52406..009f22a1b61 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in
index 098e7854520..e75761ff38a 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in
index df26a90f42c..7d490b595b9 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in
index 26fda5c1e9a..c86bce7cd62 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/upper-sorbian/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in
index d40da36f599..d2fbe61158e 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in
@@ -54,7 +54,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -77,6 +76,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -93,6 +93,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
index db1dd8371a1..afffe68c7bb 100644
--- a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
@@ -64,7 +64,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -87,6 +86,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -103,6 +103,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/make-rules/styles/Makefile.in b/Build/source/utils/xindy/make-rules/styles/Makefile.in
index af8d91750ac..74c66a6ebc1 100644
--- a/Build/source/utils/xindy/make-rules/styles/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/styles/Makefile.in
@@ -64,7 +64,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -87,6 +86,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -103,6 +103,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/modules/Makefile.in b/Build/source/utils/xindy/modules/Makefile.in
index 1dfa13ee549..81b0d157059 100644
--- a/Build/source/utils/xindy/modules/Makefile.in
+++ b/Build/source/utils/xindy/modules/Makefile.in
@@ -66,7 +66,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -89,6 +88,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -105,6 +105,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/modules/base/Makefile.in b/Build/source/utils/xindy/modules/base/Makefile.in
index 5bc517166ec..d355f5e82ca 100644
--- a/Build/source/utils/xindy/modules/base/Makefile.in
+++ b/Build/source/utils/xindy/modules/base/Makefile.in
@@ -64,7 +64,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -87,6 +86,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -103,6 +103,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/modules/class/Makefile.in b/Build/source/utils/xindy/modules/class/Makefile.in
index 074c81a47d5..f38c0b68b6f 100644
--- a/Build/source/utils/xindy/modules/class/Makefile.in
+++ b/Build/source/utils/xindy/modules/class/Makefile.in
@@ -64,7 +64,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -87,6 +86,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -103,6 +103,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/modules/lang/Makefile.in b/Build/source/utils/xindy/modules/lang/Makefile.in
index 68c0f976502..4d14f66b35b 100644
--- a/Build/source/utils/xindy/modules/lang/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/Makefile.in
@@ -66,7 +66,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -89,6 +88,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -105,6 +105,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/modules/lang/german/Makefile.in b/Build/source/utils/xindy/modules/lang/german/Makefile.in
index c780ec912bf..2d75e999b52 100644
--- a/Build/source/utils/xindy/modules/lang/german/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/german/Makefile.in
@@ -64,7 +64,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -87,6 +86,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -103,6 +103,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/modules/lang/latin/Makefile.in b/Build/source/utils/xindy/modules/lang/latin/Makefile.in
index 7ece3b69dfe..69a20e904fb 100644
--- a/Build/source/utils/xindy/modules/lang/latin/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/latin/Makefile.in
@@ -64,7 +64,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -87,6 +86,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -103,6 +103,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/modules/ord/Makefile.in b/Build/source/utils/xindy/modules/ord/Makefile.in
index 673cc05c5b6..2f45694f0a5 100644
--- a/Build/source/utils/xindy/modules/ord/Makefile.in
+++ b/Build/source/utils/xindy/modules/ord/Makefile.in
@@ -64,7 +64,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -87,6 +86,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -103,6 +103,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/modules/rules/Makefile.in b/Build/source/utils/xindy/modules/rules/Makefile.in
index d23d4f9738d..830e1ea1bef 100644
--- a/Build/source/utils/xindy/modules/rules/Makefile.in
+++ b/Build/source/utils/xindy/modules/rules/Makefile.in
@@ -64,7 +64,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -87,6 +86,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -103,6 +103,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/modules/styles/Makefile.in b/Build/source/utils/xindy/modules/styles/Makefile.in
index 9c25156d539..ce9229c379f 100644
--- a/Build/source/utils/xindy/modules/styles/Makefile.in
+++ b/Build/source/utils/xindy/modules/styles/Makefile.in
@@ -64,7 +64,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -87,6 +86,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -103,6 +103,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/rte/Makefile.in b/Build/source/utils/xindy/rte/Makefile.in
index 55b48fa0a35..bc0cd81657a 100644
--- a/Build/source/utils/xindy/rte/Makefile.in
+++ b/Build/source/utils/xindy/rte/Makefile.in
@@ -66,7 +66,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -89,6 +88,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -105,6 +105,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -466,15 +467,15 @@ uninstall-am:
tags-recursive uninstall uninstall-am
-all-local: $(binariesdir)/xindy.run $(binariesdir)/base.mem
+all-local: $(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem
-$(binariesdir)/xindy.run $(binariesdir)/base.mem:
+$(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem:
rm -rf xindy-build-dir
test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/$$i; done
$(MAKE) -C ordrules ordrulei.c
- env CLISP_LINKKIT="$(CLISP_LIB)/linkkit" \
- sh "$(CLISP_LIB)/clisp-link" add-module-set ordrules "$(CLISP_LIB)/full" xindy-build-dir
- cp xindy-build-dir/lisp.run $(binariesdir)/xindy.run
+ env CLISP_LINKKIT='@CLISP_LIB@/linkkit' \
+ sh '@CLISP_LIB@/clisp-link' add-module-set ordrules '@CLISP_LIB@/full' xindy-build-dir
+ cp xindy-build-dir/$(LISP_RUN) $(binariesdir)/$(XINDY_RUN)
cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem
clean-local:
diff --git a/Build/source/utils/xindy/rte/ordrules/Makefile.in b/Build/source/utils/xindy/rte/ordrules/Makefile.in
index b1c66885a5c..9386ef8497f 100644
--- a/Build/source/utils/xindy/rte/ordrules/Makefile.in
+++ b/Build/source/utils/xindy/rte/ordrules/Makefile.in
@@ -57,7 +57,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -80,6 +79,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -96,6 +96,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -319,13 +320,13 @@ ordrulei.c: $(srcdir)/ordrulei.lsp
$(CLISP) -q -norc -c $(srcdir)/ordrulei.lsp -o ordrulei.fas
ordrulei.o: ordrulei.c
- $(CC) $(CFLAGS) -I$(INCLUDES) -c ordrulei.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -I$(INCLUDES) -c ordrulei.c
ordrules.o: ordrules.c ordrules.h rxsub.h debug.h mkind.h
- $(CC) $(CFLAGS) -funsigned-char -I. -c ordrules.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -I$(INCLUDES) -funsigned-char -I. -c ordrules.c
rxsub.o: rxsub.c rxsub.h mkind.h
- $(CC) $(CFLAGS) -I. -c rxsub.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -I. -c rxsub.c
# Make a module
clisp-module: ordrulei.o ordrules.o rxsub.o
diff --git a/Build/source/utils/xindy/src/Makefile.in b/Build/source/utils/xindy/src/Makefile.in
index f972bf69296..23b0c2f1275 100644
--- a/Build/source/utils/xindy/src/Makefile.in
+++ b/Build/source/utils/xindy/src/Makefile.in
@@ -56,7 +56,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -79,6 +78,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -95,6 +95,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/tex2xindy/Makefile.in b/Build/source/utils/xindy/tex2xindy/Makefile.in
index 97f1105def3..c3572f9c1fd 100644
--- a/Build/source/utils/xindy/tex2xindy/Makefile.in
+++ b/Build/source/utils/xindy/tex2xindy/Makefile.in
@@ -77,7 +77,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -100,6 +99,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -116,6 +116,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/utils/xindy/user-commands/Makefile.in b/Build/source/utils/xindy/user-commands/Makefile.in
index 1656c435cb7..08e955183a9 100644
--- a/Build/source/utils/xindy/user-commands/Makefile.in
+++ b/Build/source/utils/xindy/user-commands/Makefile.in
@@ -65,7 +65,6 @@ CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLISP = @CLISP@
-CLISP_LIB = @CLISP_LIB@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -88,6 +87,7 @@ LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LISP_RUN = @LISP_RUN@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -104,6 +104,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XINDY_RUN = @XINDY_RUN@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@