summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorVladimir Volovich <vvv@vsu.ru>2008-05-18 06:07:54 +0000
committerVladimir Volovich <vvv@vsu.ru>2008-05-18 06:07:54 +0000
commitbe93cd8e5808962fd0f3a2ce70294e0c924a3df2 (patch)
treec0dfde7defa20ddc9d5103962a772da168791526 /Build
parent3707fab2069975a52791bf2d59d2e7d6e63fac77 (diff)
change the condition for the "special texlive build behavior":
previously it was triggered just by the --enable-tetex-build configure option, but some distributions are using both --enable-tetex-build and at the same time redefine the datadir, docdir, mandir, etc. now, the "special texlive build behavior" is enabled when both the --enable-tetex-build option is used, AND $datadir is the same as $prefix, which is the case when using the default Build script. the "special texlive build behavior" for xindy consists of: * installing "xindy" and "texindy" as symlinks pointing to scripts in the texmf/scripts/xindy/ directory, rather than copying them as regular files into bindir. * installing xindy.mem into bindir (rather than into pkglibdir), as in texlive, it is the only platform-dependent directory, and there's no per-platform lib directory. * redefining datadir, docdir and mandir to the layout used in texlive: datadir="$prefix/texmf" docdir="$prefix/texmf/doc/$PACKAGE_NAME" mandir="$prefix/texmf/doc/man" * disabling docs generation and make-rules build (because they require working latex and pdflatex during build). in normal texlive builds, the docs and make-rules are installed in the texmf tree, and need not be re-built. if distributor wants to build the whole texlive, with xindy, and uses the --enable-tetex-build, but redefines datadir, we disable the above "special texlive build behavior". in this case, however, please keep in mind that you need the working latex (for make-rules) and pdflatex (for docs) during xindy build. if you do not have it, add --disable-make-rules and --disable-docs configure options, but keep in mind that without the make-rules, xindy's install is incomplete, and you need to use the files supplied by texlive's Master/texmf/xindy tree. git-svn-id: svn://tug.org/texlive/trunk@8199 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-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])