summaryrefslogtreecommitdiff
path: root/Build/source/utils/xindy/rte
diff options
context:
space:
mode:
authorVladimir Volovich <vvv@vsu.ru>2008-03-22 04:30:47 +0000
committerVladimir Volovich <vvv@vsu.ru>2008-03-22 04:30:47 +0000
commitfaaf22ece56389786d45ae6463600986eaead3a9 (patch)
tree34f14306bdff66b91d7de7b8caea0e9e0d77b690 /Build/source/utils/xindy/rte
parent1472f655976291d22dbaa4c321df214ae82d9ec3 (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/rte')
-rw-r--r--Build/source/utils/xindy/rte/Makefile.am18
-rw-r--r--Build/source/utils/xindy/rte/ordrules/Makefile.in4
2 files changed, 10 insertions, 12 deletions
diff --git a/Build/source/utils/xindy/rte/Makefile.am b/Build/source/utils/xindy/rte/Makefile.am
index f1c852e57cc..a3a1e78e265 100644
--- a/Build/source/utils/xindy/rte/Makefile.am
+++ b/Build/source/utils/xindy/rte/Makefile.am
@@ -26,18 +26,18 @@ clisp_src = clisp-2.43
clisp_builddir = $(shell pwd)/clisp-build-dir
if EXT_CLISP
- export CLISP_DIR = @CLISP_DIR@
- export CLISP_PATH = @CLISP_PATH@
+ CLISP_LIB = $(shell $(CLISP) -q -norc -x '(progn (princ *lib-directory*) (values))')
+ export CLISP = @CLISP@
CLISP_PREREQ =
else
- export CLISP_DIR = $(clisp_builddir)
- export CLISP_PATH = $(CLISP_DIR)/clisp
+ CLISP_LIB = $(clisp_builddir)
+ export CLISP = $(clisp_builddir)/clisp
CLISP_PREREQ = $(clisp_link) $(fulldir)
endif
-export CLISP_LINKKIT = $(CLISP_DIR)/linkkit
-fulldir = $(CLISP_DIR)/full
-clisp_link = $(CLISP_DIR)/clisp-link
+export CLISP_LINKKIT = $(CLISP_LIB)/linkkit
+fulldir = $(CLISP_LIB)/full
+clisp_link = $(CLISP_LIB)/clisp-link
binariesdir = ../binaries
@@ -77,8 +77,8 @@ ORDRULES_FILES = ordrules.c ordrules.h rxsub.c rxsub.h mkind.h debug.h link.sh
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/rte/ordrules/Makefile.in b/Build/source/utils/xindy/rte/ordrules/Makefile.in
index 72099d09c7e..1726d2bbfca 100644
--- a/Build/source/utils/xindy/rte/ordrules/Makefile.in
+++ b/Build/source/utils/xindy/rte/ordrules/Makefile.in
@@ -13,12 +13,10 @@ CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@
INCLUDES=
-CLISP = $(CLISP_PATH) -q -norc
-
all : ordrulei.o ordrules.o rxsub.o
ordrulei.c : $(srcdir)/ordrulei.lsp
- $(CLISP) -c $(srcdir)/ordrulei.lsp -o ordrulei.fas
+ $(CLISP) -q -norc -c $(srcdir)/ordrulei.lsp -o ordrulei.fas
ordrulei.o : ordrulei.c
$(CC) $(CFLAGS) -I$(INCLUDES) -c ordrulei.c