diff options
author | Vladimir Volovich <vvv@vsu.ru> | 2008-03-22 04:30:47 +0000 |
---|---|---|
committer | Vladimir Volovich <vvv@vsu.ru> | 2008-03-22 04:30:47 +0000 |
commit | faaf22ece56389786d45ae6463600986eaead3a9 (patch) | |
tree | 34f14306bdff66b91d7de7b8caea0e9e0d77b690 /Build/source/utils/xindy/binaries | |
parent | 1472f655976291d22dbaa4c321df214ae82d9ec3 (diff) |
* instead of 3 configure options: --enable-external-clisp,
--enable-clisp-path, --enable-clisp-dir there is now only one:
--with-external-clisp[=PATH] which, when used, asks to use an
external clisp, which is searched in $PATH, or it is possible
to supply an absolute location if it is not in $PATH.
* the former --enable-clisp-dir option is removed; instead, we use
a robust way to determine CLISP library directory by calling
clisp -q -norc -x '(progn (princ *lib-directory*) (values))'
(this is borrowed from the Meta-CVS package, referenced at
http://www.niksula.cs.hut.fi/~tsiivola/clisp-ffi-howto.html)
* the configure script performs better checking of clisp
availability and shows proper errors when needed.
* added the --enable-tetex-build option which is used for the
texlive builds, and installs the files at the texlive-specific
locations. added corresponding support to the user-commands
scripts (xindy, xindy.v2, texindy), to allow them locate
xindy.{run,mem} and runtime *.xdy modules in the texlive layout.
* do not fail if clisp-link shell script exists but is not
executable, as it happens in some distributions. instead, call
it via "sh".
git-svn-id: svn://tug.org/texlive/trunk@7067 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/xindy/binaries')
-rw-r--r-- | Build/source/utils/xindy/binaries/Makefile.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Build/source/utils/xindy/binaries/Makefile.am b/Build/source/utils/xindy/binaries/Makefile.am index ebc00f3b851..be5396ce9c6 100644 --- a/Build/source/utils/xindy/binaries/Makefile.am +++ b/Build/source/utils/xindy/binaries/Makefile.am @@ -28,12 +28,15 @@ DUMP_XINDY = $(SRCDIR)/dump-xindy.lsp MEMFILE = xindy.mem XINDY_RUN = ./xindy.run -q -M ./base.mem +if TETEX_BUILD + MODULEDIR = $(prefix)/texmf/scripts/xindy + kerneldir = $(bindir) +else # Where the modules are found at runtime. -MODULEDIR = $(pkgdatadir) - + MODULEDIR = $(pkgdatadir) # Where the files xindy.run and xindy.mem should be installed. -kerneldir = $(pkglibdir) - + kerneldir = $(pkglibdir) +endif xindy.mem: $(DEFAULTS) $(FAS) base.mem xindy.run rm -f $(MEMFILE) |