fix build for the new version of clisp, which has new syntax for clisp-link.

OK kili@
This commit is contained in:
edd 2010-01-07 10:57:17 +00:00
parent 85631eff8f
commit a299569caf
2 changed files with 19 additions and 5 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.28 2009/12/15 18:01:57 espie Exp $
# $OpenBSD: Makefile,v 1.29 2010/01/07 10:57:17 edd Exp $
COMMENT = base binaries for TeXLive typesetting distribution
DISTNAME = texlive-${DIST_V}-source
PKGNAME = texlive_base-${V}p0
PKGNAME = texlive_base-${V}p1
SHARED_LIBS = kpathsea 2.0
WANTLIB = m X11 ICE freetype Xt c Xext fontconfig Xpm SM Xmu z \
@ -22,9 +22,8 @@ LIB_DEPENDS = t1.>=4::devel/t1lib \
png.>=3::graphics/png \
gd::graphics/gd \
ttf::print/freetype \
poppler::print/poppler
poppler::print/poppler \
avcall,callback::devel/ffcall
# Never set SEPARATE_BUILD
CONFIGURE_STYLE = gnu

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-utils_xindy_rte_Makefile_in,v 1.1 2010/01/07 10:57:17 edd Exp $
A fix for the newer versions of clisp where clisp-link invocation no longer
uses add-module-set.
--- utils/xindy/rte/Makefile.in.orig Wed Aug 5 12:36:50 2009
+++ utils/xindy/rte/Makefile.in Sat Jan 2 14:49:00 2010
@@ -548,7 +548,6 @@ $(binariesdir)/$(XINDY_RUN):
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 '$(CLISP_LIB)/full' xindy-build-dir ordrules
$(INSTALL_STRIP_PROGRAM) xindy-build-dir/$(LISP_RUN) $(binariesdir)/$(XINDY_RUN)