summaryrefslogtreecommitdiff
path: root/Build/source/utils/xindy
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/utils/xindy')
-rwxr-xr-xBuild/source/utils/xindy/configure4
-rw-r--r--Build/source/utils/xindy/configure.ac5
2 files changed, 6 insertions, 3 deletions
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index 86c66d5cfd4..e76cbfe544f 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -3703,7 +3703,7 @@ if test "${with_clisp+set}" = set; then
fi
-if test "x$enable_tetex_build" = xyes; then
+if test "x$enable_tetex_build" = xyes -a "x$datadir" = "x$prefix"; then
{ echo "$as_me:$LINENO: Using installation layout for TeX Live" >&5
echo "$as_me: Using installation layout for TeX Live" >&6;}
datadir="$prefix/texmf"
@@ -3719,6 +3719,8 @@ echo "$as_me: Disabling docs building" >&6;}
echo "$as_me: Disabling make-rules building" >&6;}
enable_make_rules=no;
fi
+else
+ enable_tetex_build=no
fi
if test "x$enable_tetex_build" = xyes; then
TETEX_BUILD_TRUE=
diff --git a/Build/source/utils/xindy/configure.ac b/Build/source/utils/xindy/configure.ac
index d9b23d6a692..1bb1321fdfa 100644
--- a/Build/source/utils/xindy/configure.ac
+++ b/Build/source/utils/xindy/configure.ac
@@ -39,8 +39,7 @@ AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs],[build and install documentat
AC_ARG_ENABLE(tetex-build, AS_HELP_STRING([--enable-tetex-build],[Build as part of a TeX Live installation]))
AC_ARG_WITH(clisp, AS_HELP_STRING([--with-clisp=...],[Use the specified location of the clisp executable (default is search in PATH)]))
-if test "x$enable_tetex_build" = xyes; then
-dnl we don't really care whether $srcdir/../../texk/kpathsea is found, so don't test for it.
+if test "x$enable_tetex_build" = xyes -a "x$datadir" = "x$prefix"; then
AC_MSG_NOTICE([Using installation layout for TeX Live])
datadir="$prefix/texmf"
docdir="$prefix/texmf/doc/$PACKAGE_NAME"
@@ -53,6 +52,8 @@ dnl we don't really care whether $srcdir/../../texk/kpathsea is found, so don't
AC_MSG_NOTICE([Disabling make-rules building])
enable_make_rules=no;
fi
+else
+ enable_tetex_build=no
fi
AM_CONDITIONAL([TETEX_BUILD],[test "x$enable_tetex_build" = xyes])