summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-08-05 11:36:50 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-08-05 11:36:50 +0000
commitf1e70a940a786a456ae122bb898ab985645d8df7 (patch)
treebe25a5b63edaecceee14e6cb3e788b2af2d4cb21 /Build
parent4601d405ed4dd6ec16d8c8c4b19767e572d3c228 (diff)
adapt xindy build to new clisp-2.48
git-svn-id: svn://tug.org/texlive/trunk@14532 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/utils/xindy/ChangeLog.TL5
-rw-r--r--Build/source/utils/xindy/rte/Makefile.am5
-rw-r--r--Build/source/utils/xindy/rte/Makefile.in5
3 files changed, 13 insertions, 2 deletions
diff --git a/Build/source/utils/xindy/ChangeLog.TL b/Build/source/utils/xindy/ChangeLog.TL
index 336c27997c3..4a9bcc3890d 100644
--- a/Build/source/utils/xindy/ChangeLog.TL
+++ b/Build/source/utils/xindy/ChangeLog.TL
@@ -1,6 +1,11 @@
ChangeLog.TL: Changes for xindy (teTeX / TeX Live)
======================================================
+2009-08-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * rte/Makefile.am (XINDY_RUN): For clisp Version 2.48 use
+ 'clisp-link add' instead of 'clisp-link add-module-path'.
+
2009-06-03 Karl Berry <karl@tug.org>
* rte/Makefile.am (XINDY_RUN): $(STRIP) it.
diff --git a/Build/source/utils/xindy/rte/Makefile.am b/Build/source/utils/xindy/rte/Makefile.am
index 01ee8377f39..3b6b112c88f 100644
--- a/Build/source/utils/xindy/rte/Makefile.am
+++ b/Build/source/utils/xindy/rte/Makefile.am
@@ -33,12 +33,15 @@ all-local: $(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem
#
$(binariesdir)/base.mem: $(binariesdir)/$(XINDY_RUN)
cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem
+# The clisp-link command 'add-module-set' of Versions <=2.47
+# has been replaced by 'add' in Version 2.48 (different args!).
$(binariesdir)/$(XINDY_RUN):
rm -rf xindy-build-dir
test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/$$i; done
$(MAKE) -C ordrules ordrulei.c
env CLISP_LINKKIT='$(CLISP_LIB)/linkkit' MAKE="$(MAKE)" \
- sh '$(CLISP_LIB)/clisp-link' add-module-set ordrules '$(CLISP_LIB)/full' xindy-build-dir
+ sh '$(CLISP_LIB)/clisp-link' add-module-set ordrules '$(CLISP_LIB)/full' xindy-build-dir || \
+ sh '$(CLISP_LIB)/clisp-link' add '$(CLISP_LIB)/full' xindy-build-dir ordrules
$(INSTALL_STRIP_PROGRAM) xindy-build-dir/$(LISP_RUN) $(binariesdir)/$(XINDY_RUN)
clean-local:
diff --git a/Build/source/utils/xindy/rte/Makefile.in b/Build/source/utils/xindy/rte/Makefile.in
index f7560720e9e..e92eb371f0b 100644
--- a/Build/source/utils/xindy/rte/Makefile.in
+++ b/Build/source/utils/xindy/rte/Makefile.in
@@ -541,12 +541,15 @@ all-local: $(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem
#
$(binariesdir)/base.mem: $(binariesdir)/$(XINDY_RUN)
cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem
+# The clisp-link command 'add-module-set' of Versions <=2.47
+# has been replaced by 'add' in Version 2.48 (different args!).
$(binariesdir)/$(XINDY_RUN):
rm -rf xindy-build-dir
test -f ordrules/link.sh || for i in $(ORDRULES_FILES); do cp -p $(top_srcdir)/rte/ordrules/$$i ordrules/$$i; done
$(MAKE) -C ordrules ordrulei.c
env CLISP_LINKKIT='$(CLISP_LIB)/linkkit' MAKE="$(MAKE)" \
- sh '$(CLISP_LIB)/clisp-link' add-module-set ordrules '$(CLISP_LIB)/full' xindy-build-dir
+ sh '$(CLISP_LIB)/clisp-link' add-module-set ordrules '$(CLISP_LIB)/full' xindy-build-dir || \
+ sh '$(CLISP_LIB)/clisp-link' add '$(CLISP_LIB)/full' xindy-build-dir ordrules
$(INSTALL_STRIP_PROGRAM) xindy-build-dir/$(LISP_RUN) $(binariesdir)/$(XINDY_RUN)
clean-local: