autoreconf

git-svn-id: svn://tug.org/texlive/trunk@7068 c570f23f-e606-0410-a88d-b1316a301751
author: Vladimir Volovich <vvv@vsu.ru> 2008-03-22 04:31:34 +0000
committer: Vladimir Volovich <vvv@vsu.ru> 2008-03-22 04:31:34 +0000
commit: 60f9acbe7755e2d3c9b64a909a8a2f83b8e0a3f1 (patch)
tree: 0c3a43b7d28f6e3f89e33a22347554a728ad1b4e /Build/source/utils/xindy
parent: faaf22ece56389786d45ae6463600986eaead3a9 (diff)
66 files changed, 441 insertions, 219 deletions
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index d1658df1afb..8e05f1642cf 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -79,8 +79,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -121,6 +120,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
diff --git a/Build/source/utils/xindy/binaries/Makefile.in b/Build/source/utils/xindy/binaries/Makefile.in
index 76df79c2fa1..296b66e8c46 100644
--- a/Build/source/utils/xindy/binaries/Makefile.in
+++ b/Build/source/utils/xindy/binaries/Makefile.in
@@ -74,8 +74,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -116,6 +115,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -175,12 +176,12 @@ DEFAULTS = defaults.xdy
 DUMP_XINDY = $(SRCDIR)/dump-xindy.lsp
 MEMFILE = xindy.mem
 XINDY_RUN = ./xindy.run -q -M ./base.mem
-
 # Where the modules are found at runtime.
-MODULEDIR = $(pkgdatadir)
-
+@TETEX_BUILD_FALSE@MODULEDIR = $(pkgdatadir)
+@TETEX_BUILD_TRUE@MODULEDIR = $(prefix)/texmf/scripts/xindy
 # Where the files xindy.run and xindy.mem should be installed.
-kerneldir = $(pkglibdir)
+@TETEX_BUILD_FALSE@kerneldir = $(pkglibdir)
+@TETEX_BUILD_TRUE@kerneldir = $(bindir)
 
 # *.lib files which should be cleaned
 FASLIBS = base.lib locref.lib idxstyle.lib index.lib version.lib markup.lib
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index 18aedad880d..c41182d86ef 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -709,10 +709,11 @@ BUILDRULES_FALSE
 pdflatex
 BUILDDOCS_TRUE
 BUILDDOCS_FALSE
+TETEX_BUILD_TRUE
+TETEX_BUILD_FALSE
+CLISP
 EXT_CLISP_TRUE
 EXT_CLISP_FALSE
-CLISP_PATH
-CLISP_DIR
 build
 build_cpu
 build_vendor
@@ -1322,9 +1323,14 @@ Optional Features:
   --enable-make-rules     build and install make-rules package (default is
                           YES)
   --enable-docs           build and install documentation (default is YES)
-  --enable-external-clisp Use an external CLISP instead of the one in rte/
-  --enable-clisp-path     Where to search the external CLISP
-  --enable-clisp-dir      Where to seach the external CLISP library
+  --enable-tetex-build    Build as part of a teTeX installation
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-external-clisp[=PATH]
+                          Use the external CLISP binary instead of re-building
+                          CLISP from source in the rte/ directory
 
 Some influential environment variables:
   CXX         C++ compiler command
@@ -4771,59 +4777,189 @@ else
 fi
 
 
-# Check whether --enable-external-clisp was given.
-if test "${enable_external_clisp+set}" = set; then
-  enableval=$enable_external_clisp; EXT_CLISP=$enableval
-else
-  EXT_CLISP=no
+# Building inside teTeX or TeX Live?
+# Check whether --enable-tetex-build was given.
+if test "${enable_tetex_build+set}" = set; then
+  enableval=$enable_tetex_build;
 fi
 
 
-# Check whether --enable-clisp-path was given.
-if test "${enable_clisp_path+set}" = set; then
-  enableval=$enable_clisp_path; CLISP_PATH=$enableval
+if test "x$enable_tetex_build" = xyes; then
+  if test ! -d $srcdir/../../texk/kpathsea; then
+    { { echo "$as_me:$LINENO: error:
+=========================================
+
+You specified --enable-tetex-build, but I can't find the kpathsea
+directory.  I expected it to be in $srcdir/../../texk/kpathsea.
+
+=========================================" >&5
+echo "$as_me: error:
+=========================================
+
+You specified --enable-tetex-build, but I can't find the kpathsea
+directory.  I expected it to be in $srcdir/../../texk/kpathsea.
+
+=========================================" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  docdir="$prefix/texmf/doc/$PACKAGE_NAME"
 else
-  CLISP_PATH=$(which clisp)
+  docdir="$datadir/doc/$PACKAGE_NAME-$PACKAGE_VERSION"
 fi
 
 
-# Check whether --enable-clisp-dir was given.
-if test "${enable_clisp_dir+set}" = set; then
-  enableval=$enable_clisp_dir; CLISP_DIR=$enableval
+if test "x$enable_tetex_build" = xyes; then
+  TETEX_BUILD_TRUE=
+  TETEX_BUILD_FALSE='#'
 else
-  CLISP_DIR=/usr/lib/clisp
+  TETEX_BUILD_TRUE='#'
+  TETEX_BUILD_FALSE=
 fi
 
 
-if test "$EXT_CLISP" != no; then
+
+# Check whether --with-external-clisp was given.
+if test "${with_external_clisp+set}" = set; then
+  withval=$with_external_clisp;
+fi
 
 
-if test -x "$CLISP_PATH" -a -x "$CLISP_DIR/clisp-link" -a -d "$CLISP_DIR/full" -a -d "$CLISP_DIR/linkkit"; then
-  EXT_CLISP_TRUE=
-  EXT_CLISP_FALSE='#'
+CLISP=
+if test "x$with_external_clisp" = xyes; then
+  # Extract the first word of "clisp", so it can be a program name with args.
+set dummy clisp; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_CLISP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  EXT_CLISP_TRUE='#'
-  EXT_CLISP_FALSE=
-fi
+  case $CLISP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CLISP="$CLISP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_CLISP="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
+  ;;
+esac
+fi
+CLISP=$ac_cv_path_CLISP
+if test -n "$CLISP"; then
+  { echo "$as_me:$LINENO: result: $CLISP" >&5
+echo "${ECHO_T}$CLISP" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
 
 
+  if test -z "$CLISP"; then
+    { { echo "$as_me:$LINENO: error: --with-external-clisp specified, but clisp binary not found in PATH" >&5
+echo "$as_me: error: --with-external-clisp specified, but clisp binary not found in PATH" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+elif test "x$with_external_clisp" = xno; then
+  if test -d "$srcdir/rte/clisp-2.43"; then
+    { echo "$as_me:$LINENO: Using internal clisp" >&5
+echo "$as_me: Using internal clisp" >&6;}
+  else
+    { { echo "$as_me:$LINENO: error: --without-external-clisp specified, but clisp source directory not found at $srcdir/rte/clisp-2.43" >&5
+echo "$as_me: error: --without-external-clisp specified, but clisp source directory not found at $srcdir/rte/clisp-2.43" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+elif test -n "$with_external_clisp"; then
+  CLISP="$with_external_clisp"
+else
+  # Extract the first word of "clisp", so it can be a program name with args.
+set dummy clisp; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_CLISP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $CLISP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CLISP="$CLISP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_CLISP="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-    if test -n "$EXT_CLISP_TRUE"; then
-        if test "$EXT_CLISP" = yes; then
-            echo Help me! I should use an external CLISP, but I can\'t find it. >&2
-            exit 1
-        else
-            echo Using internal clisp
-            EXT_CLISP=no
-        fi
-    else
-        echo Using external clisp
-    fi
+  ;;
+esac
+fi
+CLISP=$ac_cv_path_CLISP
+if test -n "$CLISP"; then
+  { echo "$as_me:$LINENO: result: $CLISP" >&5
+echo "${ECHO_T}$CLISP" >&6; }
 else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  if test -n "$CLISP"; then
+    :
+  elif test -d "$srcdir/rte/clisp-2.43"; then
+    { echo "$as_me:$LINENO: Using internal clisp" >&5
+echo "$as_me: Using internal clisp" >&6;}
+  else
+    { { echo "$as_me:$LINENO: error: clisp binary not found in PATH, nor the clisp source directory at $srcdir/rte/clisp-2.43" >&5
+echo "$as_me: error: clisp binary not found in PATH, nor the clisp source directory at $srcdir/rte/clisp-2.43" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+if test -n "$CLISP"; then
+  test -x "$CLISP" || { { echo "$as_me:$LINENO: error: clisp binary is not executable: $CLISP" >&5
+echo "$as_me: error: clisp binary is not executable: $CLISP" >&2;}
+   { (exit 1); exit 1; }; }
+  { echo "$as_me:$LINENO: checking for clisp library directory" >&5
+echo $ECHO_N "checking for clisp library directory... $ECHO_C" >&6; }
+  CLISP_LIB=$($CLISP -q -norc -x '(progn (princ *lib-directory*) (values))')
+  { echo "$as_me:$LINENO: result: $CLISP_LIB" >&5
+echo "${ECHO_T}$CLISP_LIB" >&6; }
+  test -f "$CLISP_LIB/clisp-link" || { { echo "$as_me:$LINENO: error: expected file is not found: $CLISP_LIB/clisp-link" >&5
+echo "$as_me: error: expected file is not found: $CLISP_LIB/clisp-link" >&2;}
+   { (exit 1); exit 1; }; }
+  test -d "$CLISP_LIB/full" || { { echo "$as_me:$LINENO: error: expected directory is not found: $CLISP_LIB/full" >&5
+echo "$as_me: error: expected directory is not found: $CLISP_LIB/full" >&2;}
+   { (exit 1); exit 1; }; }
+  test -d "$CLISP_LIB/linkkit" || { { echo "$as_me:$LINENO: error: expected directory is not found: $CLISP_LIB/linkkit" >&5
+echo "$as_me: error: expected directory is not found: $CLISP_LIB/linkkit" >&2;}
+   { (exit 1); exit 1; }; }
+  { echo "$as_me:$LINENO: Using external clisp" >&5
+echo "$as_me: Using external clisp" >&6;}
+fi
+
 
 
-if false; then
+if test -n "$CLISP"; then
   EXT_CLISP_TRUE=
   EXT_CLISP_FALSE='#'
 else
@@ -4831,7 +4967,6 @@ else
   EXT_CLISP_FALSE=
 fi
 
-fi
 
 # Checks for libraries.
 
@@ -5640,10 +5775,10 @@ echo "$as_me: error: conditional \"BUILDDOCS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${EXT_CLISP_TRUE}" && test -z "${EXT_CLISP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"EXT_CLISP\" was never defined.
+if test -z "${TETEX_BUILD_TRUE}" && test -z "${TETEX_BUILD_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"TETEX_BUILD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"EXT_CLISP\" was never defined.
+echo "$as_me: error: conditional \"TETEX_BUILD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6329,8 +6464,8 @@ BUILDRULES_FALSE!$BUILDRULES_FALSE$ac_delim
 pdflatex!$pdflatex$ac_delim
 BUILDDOCS_TRUE!$BUILDDOCS_TRUE$ac_delim
 BUILDDOCS_FALSE!$BUILDDOCS_FALSE$ac_delim
-EXT_CLISP_TRUE!$EXT_CLISP_TRUE$ac_delim
-EXT_CLISP_FALSE!$EXT_CLISP_FALSE$ac_delim
+TETEX_BUILD_TRUE!$TETEX_BUILD_TRUE$ac_delim
+TETEX_BUILD_FALSE!$TETEX_BUILD_FALSE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -6372,8 +6507,9 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-CLISP_PATH!$CLISP_PATH$ac_delim
-CLISP_DIR!$CLISP_DIR$ac_delim
+CLISP!$CLISP$ac_delim
+EXT_CLISP_TRUE!$EXT_CLISP_TRUE$ac_delim
+EXT_CLISP_FALSE!$EXT_CLISP_FALSE$ac_delim
 build!$build$ac_delim
 build_cpu!$build_cpu$ac_delim
 build_vendor!$build_vendor$ac_delim
@@ -6386,7 +6522,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` = 12; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; 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 e901f6cd925..19b7f057d19 100644
--- a/Build/source/utils/xindy/doc/Makefile.in
+++ b/Build/source/utils/xindy/doc/Makefile.in
@@ -80,8 +80,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -122,6 +121,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -144,7 +145,7 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
-docdir = $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
diff --git a/Build/source/utils/xindy/doc/style-tutorial/Makefile.in b/Build/source/utils/xindy/doc/style-tutorial/Makefile.in
index 31b5b3739bc..65c9d4ed807 100644
--- a/Build/source/utils/xindy/doc/style-tutorial/Makefile.in
+++ b/Build/source/utils/xindy/doc/style-tutorial/Makefile.in
@@ -71,8 +71,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -113,6 +112,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -135,7 +136,7 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
-docdir = $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
diff --git a/Build/source/utils/xindy/make-rules/Makefile.in b/Build/source/utils/xindy/make-rules/Makefile.in
index 1adfb922a11..10c401e633d 100644
--- a/Build/source/utils/xindy/make-rules/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/Makefile.in
@@ -70,8 +70,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -112,6 +111,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
index 2d6d1c7ab86..08b843b9ff7 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.in
@@ -167,8 +167,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -209,6 +208,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -231,15 +232,7 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
-#	echo "\ienc{iso-8859-7}" >>$@
-#	echo "\fenc{LGR}" >>$@
-#	echo "\chapter{Other scripts}" >>$@
-#	for i in $(DOCS_OTHER); do echo "\input{$$i}" >>$@; done
-#	FIXME: UTF8 encoding
-#	echo "\section{UTF-8 scripts}" >>$@
-#	for i in $(DOCS_UTF8); do echo "\input{$$i}" >>$@; done
-#	echo "\ienc{utf8}" >>$@
-docdir = $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
@@ -268,7 +261,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-langdir = $(pkgdatadir)/lang
+@TETEX_BUILD_FALSE@langdir = $(pkgdatadir)/lang
+@TETEX_BUILD_TRUE@langdir = $(prefix)/texmf/scripts/xindy/lang
 albaniandir = $(langdir)/albanian
 ALBANIAN = \
 	albanian/latin1-lang.xdy \
@@ -2414,6 +2408,14 @@ alphabets-inc.tex : $(DOCS)
 	echo "\chapter{Cyrillic scripts}" >>$@
 	echo "\section{Codepage 1251}" >>$@
 	for i in $(DOCS_CYR_1251); do echo "\input{$$i}" >>$@; done
+#	echo "\ienc{iso-8859-7}" >>$@
+#	echo "\fenc{LGR}" >>$@
+#	echo "\chapter{Other scripts}" >>$@
+#	for i in $(DOCS_OTHER); do echo "\input{$$i}" >>$@; done
+#	FIXME: UTF8 encoding
+#	echo "\section{UTF-8 scripts}" >>$@
+#	for i in $(DOCS_UTF8); do echo "\input{$$i}" >>$@; done
+#	echo "\ienc{utf8}" >>$@
 
 # whether to build docs
 
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 6933ce4a699..aa8cf0d3617 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/albanian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 2940091ae2d..fd196f240ed 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/belarusian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 b710c76fea8..f24a58c35f6 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/bulgarian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 a5a48c64e6b..a289ebb3f4b 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/croatian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 57c4ed2edbb..006db604a09 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/czech/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 772c19e24d7..0b20f9278cf 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 3c6d6734fc5..b1a6d618835 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/dutch/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 7c5072187f5..34026c9737b 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/english/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 f2ff31fd8a8..2c1f21e495f 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/esperanto/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 a14d9b421cb..b84cc8f78da 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/estonian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 45640275578..f3e44157e6f 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/finnish/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 3ccb851592f..4b1209a194d 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/french/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 e18b48f1e98..62d51e2e288 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 bee0a751fd9..55e23865e9b 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/georgian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 9b2f3b5ba4a..39ba2b0f6d9 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/german/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 23ac4c0093f..4ab679a847b 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/greek/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 3ee3db22200..b0d22e85532 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/gypsy/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 b02e6e31e0d..cc2d6563e38 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/hausa/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 b42d934aca4..c70a17028e1 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/hebrew/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 6f626451a94..3332f33979e 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/hungarian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 62a4adb4a86..8a63d082222 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 a800a19fac7..cddd97e5d5a 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/italian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 a7bad85d720..eed5a9a3bfd 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/klingon/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 127b44069a6..89758d75f1b 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/kurdish/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 87481b43196..bbf168d097e 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/latin/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 a0aa3480a5d..1ce6d31c4af 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/latvian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 dd0ba8c5c1b..6aed044e061 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/lithuanian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 d5d84040f5c..92cb69b47d5 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
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 77e0ae1b8d6..9059ead4328 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/macedonian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 a8e400dee64..17db58ccb0e 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/mongolian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 eb8c4fc8abd..06ba192ce89 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/norwegian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 fe8ca5b2795..0aee2e0393b 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/polish/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 45fa54ca9c2..199fa08b6c4 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/portuguese/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 9c9a2c5b55a..a25a2f77053 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/romanian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 00e8ade991a..1f7615b9926 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/russian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 273fee9e1bd..a96351d89fa 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/serbian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 d00a6496b2f..a5443d3d240 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/slovak/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 c0e661063fa..3e5d1730d6d 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/slovenian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 656ea8950fe..907fdfceb75 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/spanish/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 767779cf50f..1101ad9d036 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 ae27a0c4e20..a41e48099ad 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/test1/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 fd4e6e56a9c..08c2b896df6 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/turkish/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 12dda76cf0e..3ded078fddc 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/ukrainian/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 b5c3841ccd7..18d8daa4c79 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
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
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 30c2a68642c..521dc52408f 100644
--- a/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/alphabets/vietnamese/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
diff --git a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
index bdb4dbebc06..80d6585d1f0 100644
--- a/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/inputenc/Makefile.in
@@ -71,8 +71,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -113,6 +112,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -164,7 +165,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-modulesdir = $(pkgdatadir)
+@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
+@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/scripts/xindy
 inputencdir = $(modulesdir)/tex/inputenc
 INPUTENCS = \
 	cp1250.xdy \
diff --git a/Build/source/utils/xindy/make-rules/styles/Makefile.in b/Build/source/utils/xindy/make-rules/styles/Makefile.in
index f31ed8d59d9..f417449557c 100644
--- a/Build/source/utils/xindy/make-rules/styles/Makefile.in
+++ b/Build/source/utils/xindy/make-rules/styles/Makefile.in
@@ -71,8 +71,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -113,6 +112,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -164,7 +165,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-modulesdir = $(pkgdatadir)
+@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
+@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/scripts/xindy
 stylesdir = $(modulesdir)/styles
 STYLES = \
 	example.xdy \
diff --git a/Build/source/utils/xindy/modules/Makefile.in b/Build/source/utils/xindy/modules/Makefile.in
index 3080843f606..0a12258ba0a 100644
--- a/Build/source/utils/xindy/modules/Makefile.in
+++ b/Build/source/utils/xindy/modules/Makefile.in
@@ -70,8 +70,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -112,6 +111,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
diff --git a/Build/source/utils/xindy/modules/base/Makefile.in b/Build/source/utils/xindy/modules/base/Makefile.in
index 9856c85d2f3..696c97857f9 100644
--- a/Build/source/utils/xindy/modules/base/Makefile.in
+++ b/Build/source/utils/xindy/modules/base/Makefile.in
@@ -71,8 +71,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -113,6 +112,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -164,7 +165,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-modulesdir = $(pkgdatadir)
+@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
+@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/scripts/xindy
 basedir = $(modulesdir)/base
 RULES = \
 	book-order.xdy \
diff --git a/Build/source/utils/xindy/modules/class/Makefile.in b/Build/source/utils/xindy/modules/class/Makefile.in
index 9bbd3903984..9b869de5df7 100644
--- a/Build/source/utils/xindy/modules/class/Makefile.in
+++ b/Build/source/utils/xindy/modules/class/Makefile.in
@@ -71,8 +71,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -113,6 +112,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -164,7 +165,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-modulesdir = $(pkgdatadir)
+@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
+@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/scripts/xindy
 classdir = $(modulesdir)/class
 RULES = \
 	pagenums.xdy
diff --git a/Build/source/utils/xindy/modules/lang/Makefile.in b/Build/source/utils/xindy/modules/lang/Makefile.in
index 7361c78ff96..a9ab323f674 100644
--- a/Build/source/utils/xindy/modules/lang/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/Makefile.in
@@ -70,8 +70,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -112,6 +111,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
diff --git a/Build/source/utils/xindy/modules/lang/german/Makefile.in b/Build/source/utils/xindy/modules/lang/german/Makefile.in
index 6a058610fdd..c010480a3ff 100644
--- a/Build/source/utils/xindy/modules/lang/german/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/german/Makefile.in
@@ -71,8 +71,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -113,6 +112,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -164,7 +165,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-langdir = $(pkgdatadir)/lang
+@TETEX_BUILD_FALSE@langdir = $(pkgdatadir)/lang
+@TETEX_BUILD_TRUE@langdir = $(prefix)/texmf/scripts/xindy/lang
 germandir = $(langdir)/german
 RULES = \
 	din5007.xdy \
diff --git a/Build/source/utils/xindy/modules/lang/latin/Makefile.in b/Build/source/utils/xindy/modules/lang/latin/Makefile.in
index 48d59aba568..647aca7ed38 100644
--- a/Build/source/utils/xindy/modules/lang/latin/Makefile.in
+++ b/Build/source/utils/xindy/modules/lang/latin/Makefile.in
@@ -71,8 +71,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -113,6 +112,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -164,7 +165,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-langdir = $(pkgdatadir)/lang
+@TETEX_BUILD_FALSE@langdir = $(pkgdatadir)/lang
+@TETEX_BUILD_TRUE@langdir = $(prefix)/texmf/scripts/xindy/lang
 latindir = $(langdir)/latin
 RULES = \
 	caseisrt.xdy \
diff --git a/Build/source/utils/xindy/modules/ord/Makefile.in b/Build/source/utils/xindy/modules/ord/Makefile.in
index e1df1d1cc28..fa8815f7ac2 100644
--- a/Build/source/utils/xindy/modules/ord/Makefile.in
+++ b/Build/source/utils/xindy/modules/ord/Makefile.in
@@ -71,8 +71,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -113,6 +112,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -164,7 +165,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-modulesdir = $(pkgdatadir)
+@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
+@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/scripts/xindy
 orddir = $(modulesdir)/ord
 RULES = \
 	letorder.xdy
diff --git a/Build/source/utils/xindy/modules/rules/Makefile.in b/Build/source/utils/xindy/modules/rules/Makefile.in
index 8418520cd9b..b46ee45eecc 100644
--- a/Build/source/utils/xindy/modules/rules/Makefile.in
+++ b/Build/source/utils/xindy/modules/rules/Makefile.in
@@ -71,8 +71,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -113,6 +112,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -164,7 +165,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-modulesdir = $(pkgdatadir)
+@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
+@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/scripts/xindy
 rulesdir = $(modulesdir)/rules
 RULES = \
 	isolatin1-exchange.xdy \
diff --git a/Build/source/utils/xindy/modules/styles/Makefile.in b/Build/source/utils/xindy/modules/styles/Makefile.in
index 53b531e097d..fdfd7fb7e8e 100644
--- a/Build/source/utils/xindy/modules/styles/Makefile.in
+++ b/Build/source/utils/xindy/modules/styles/Makefile.in
@@ -71,8 +71,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -113,6 +112,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -164,7 +165,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-modulesdir = $(pkgdatadir)
+@TETEX_BUILD_FALSE@modulesdir = $(pkgdatadir)
+@TETEX_BUILD_TRUE@modulesdir = $(prefix)/texmf/scripts/xindy
 texdir = $(modulesdir)/styles
 RULES = basic.xdy makeidx.xdy
 EXTRA_DIST = $(RULES)
diff --git a/Build/source/utils/xindy/rte/Makefile.in b/Build/source/utils/xindy/rte/Makefile.in
index edbc7318fa4..07635144009 100644
--- a/Build/source/utils/xindy/rte/Makefile.in
+++ b/Build/source/utils/xindy/rte/Makefile.in
@@ -61,8 +61,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -103,6 +102,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -156,10 +157,12 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 clisp_src = clisp-2.43
 clisp_builddir = $(shell pwd)/clisp-build-dir
+@EXT_CLISP_FALSE@CLISP_LIB = $(clisp_builddir)
+@EXT_CLISP_TRUE@CLISP_LIB = $(shell $(CLISP) -q -norc -x '(progn (princ *lib-directory*) (values))')
 @EXT_CLISP_FALSE@CLISP_PREREQ = $(clisp_link) $(fulldir)
 @EXT_CLISP_TRUE@CLISP_PREREQ = 
-fulldir = $(CLISP_DIR)/full
-clisp_link = $(CLISP_DIR)/clisp-link
+fulldir = $(CLISP_LIB)/full
+clisp_link = $(CLISP_LIB)/clisp-link
 binariesdir = ../binaries
 
 #clisp_modules=--with-export-syscalls --with-dynamic-ffi --ignore-absence-of-libsigsegv
@@ -292,13 +295,10 @@ uninstall-am: uninstall-info-am
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am
 
+@EXT_CLISP_TRUE@    export CLISP = @CLISP@
+@EXT_CLISP_FALSE@    export CLISP = $(clisp_builddir)/clisp
 
-@EXT_CLISP_TRUE@    export CLISP_DIR = @CLISP_DIR@
-@EXT_CLISP_TRUE@    export CLISP_PATH = @CLISP_PATH@
-@EXT_CLISP_FALSE@    export CLISP_DIR = $(clisp_builddir)
-@EXT_CLISP_FALSE@    export CLISP_PATH = $(CLISP_DIR)/clisp
-
-export CLISP_LINKKIT = $(CLISP_DIR)/linkkit
+export CLISP_LINKKIT = $(CLISP_LIB)/linkkit
 
 # testing for MacOS X platform to circumvent faulty 'readline'
 # provided by Maarten Sneep <maarten.sneep@xs4all.nl>
@@ -327,8 +327,8 @@ all: xindy-build-dir
 xindy-build-dir: $(CLISP_PREREQ)
 	$(RM_R) xindy-build-dir
 	$(MAKE) -C ordrules ordrulei.c
-	test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp $(top_srcdir)/rte/ordrules/$$i ordrules/; done
-	$(clisp_link) add-module-set ordrules $(fulldir) $@
+	test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/; done
+	sh $(clisp_link) add-module-set ordrules $(fulldir) $@
 	cp $@/lisp.run $(binariesdir)/xindy.run
 	cp $@/lispinit.mem $(binariesdir)/base.mem
 
diff --git a/Build/source/utils/xindy/tex2xindy/Makefile.in b/Build/source/utils/xindy/tex2xindy/Makefile.in
index ad97e71928d..e6463c165de 100644
--- a/Build/source/utils/xindy/tex2xindy/Makefile.in
+++ b/Build/source/utils/xindy/tex2xindy/Makefile.in
@@ -82,8 +82,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -124,6 +123,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
diff --git a/Build/source/utils/xindy/user-commands/Makefile.in b/Build/source/utils/xindy/user-commands/Makefile.in
index 38b267408ce..e5f4831ee8c 100644
--- a/Build/source/utils/xindy/user-commands/Makefile.in
+++ b/Build/source/utils/xindy/user-commands/Makefile.in
@@ -38,7 +38,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = user-commands
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(dist_bin_SCRIPTS)
+	$(am__dist_bin_SCRIPTS_DIST)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_prog_latex.m4 \
 	$(top_srcdir)/m4/ac_prog_pdflatex.m4 \
@@ -50,6 +50,7 @@ CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(man1dir)"
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+am__dist_bin_SCRIPTS_DIST = texindy
 dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS) $(dist_bin_SCRIPTS)
 SOURCES =
@@ -71,8 +72,7 @@ BUILDRULES_TRUE = @BUILDRULES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CLISP_DIR = @CLISP_DIR@
-CLISP_PATH = @CLISP_PATH@
+CLISP = @CLISP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -113,6 +113,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TETEX_BUILD_FALSE = @TETEX_BUILD_FALSE@
+TETEX_BUILD_TRUE = @TETEX_BUILD_TRUE@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -164,8 +166,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-bin_SCRIPTS = xindy xindy.v2
-dist_bin_SCRIPTS = texindy
+@TETEX_BUILD_FALSE@bin_SCRIPTS = xindy xindy.v2
+@TETEX_BUILD_FALSE@dist_bin_SCRIPTS = texindy
 man_MANS = texindy.1 xindy.1 xindy.v2.1
 EXTRA_DIST = $(man_MANS)
 CLEANFILES = xindy xindy.v2
@@ -323,6 +325,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+@TETEX_BUILD_FALSE@install-exec-hook:
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -344,6 +347,8 @@ info-am:
 install-data-am: install-man
 
 install-exec-am: install-binSCRIPTS install-dist_binSCRIPTS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-am
 
@@ -376,14 +381,22 @@ uninstall-man: uninstall-man1
 	distclean-generic dvi dvi-am html html-am info info-am install \
 	install-am install-binSCRIPTS install-data install-data-am \
 	install-dist_binSCRIPTS install-exec install-exec-am \
-	install-info install-info-am install-man install-man1 \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-binSCRIPTS uninstall-dist_binSCRIPTS \
+	install-exec-hook install-info install-info-am install-man \
+	install-man1 install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-binSCRIPTS uninstall-dist_binSCRIPTS \
 	uninstall-info-am uninstall-man uninstall-man1
 
 
+@TETEX_BUILD_TRUE@install-exec-hook: xindy xindy.v2
+@TETEX_BUILD_TRUE@	$(INSTALL_SCRIPT) xindy $(prefix)/texmf/scripts/xindy/
+@TETEX_BUILD_TRUE@	$(LN_S) ../../texmf/scripts/xindy/xindy $(bindir)/xindy
+@TETEX_BUILD_TRUE@	$(INSTALL_SCRIPT) xindy.v2 $(prefix)/texmf/scripts/xindy/
+@TETEX_BUILD_TRUE@	$(LN_S) ../../texmf/scripts/xindy/xindy.v2 $(bindir)/xindy.v2
+@TETEX_BUILD_TRUE@	$(INSTALL_SCRIPT) $(srcdir)/texindy $(prefix)/texmf/scripts/xindy/
+@TETEX_BUILD_TRUE@	$(LN_S) ../../texmf/scripts/xindy/texindy $(bindir)/texindy
+
 xindy: xindy.in
 	sed -e 's:@libdir\@:$(libdir):' $(srcdir)/xindy.in >xindy
author	Vladimir Volovich <vvv@vsu.ru>	2008-03-22 04:31:34 +0000
committer	Vladimir Volovich <vvv@vsu.ru>	2008-03-22 04:31:34 +0000
commit	60f9acbe7755e2d3c9b64a909a8a2f83b8e0a3f1 (patch)
tree	0c3a43b7d28f6e3f89e33a22347554a728ad1b4e /Build/source/utils/xindy
parent	faaf22ece56389786d45ae6463600986eaead3a9 (diff)