summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorVladimir Volovich <vvv@vsu.ru>2008-05-16 07:58:07 +0000
committerVladimir Volovich <vvv@vsu.ru>2008-05-16 07:58:07 +0000
commitc908fb2dc2f6934070c55f4b7f5c5fafdc6f1ab0 (patch)
treeb77eefffb69583dcab87af368cfadfc9b9f9a2a8 /Build
parent241ceda07b169f23581314ab5cb3427cebcddc64 (diff)
pass MAKE env. var. to clisp-link, so ordrules/link.sh will use the proper make.
without this, there was a problem e.g. on FreeBSD when using gmake to build xindy, which was setting MAKEFLAGS=w but ordrules/link.sh was calling "make" (because MAKE was not passed to it), and "make" was breaking because of the MAKEFLAGS variable, thinking it is a target to make. git-svn-id: svn://tug.org/texlive/trunk@8170 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/utils/xindy/rte/Makefile.am2
-rw-r--r--Build/source/utils/xindy/rte/Makefile.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/Build/source/utils/xindy/rte/Makefile.am b/Build/source/utils/xindy/rte/Makefile.am
index 9ef7e728f8a..e4c859b3a66 100644
--- a/Build/source/utils/xindy/rte/Makefile.am
+++ b/Build/source/utils/xindy/rte/Makefile.am
@@ -33,7 +33,7 @@ $(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem:
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' \
+ env CLISP_LINKKIT='@CLISP_LIB@/linkkit' MAKE="$(MAKE)" \
sh '@CLISP_LIB@/clisp-link' add-module-set ordrules '@CLISP_LIB@/full' xindy-build-dir
cp xindy-build-dir/$(LISP_RUN) $(binariesdir)/$(XINDY_RUN)
cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem
diff --git a/Build/source/utils/xindy/rte/Makefile.in b/Build/source/utils/xindy/rte/Makefile.in
index bc0cd81657a..7829a55aba6 100644
--- a/Build/source/utils/xindy/rte/Makefile.in
+++ b/Build/source/utils/xindy/rte/Makefile.in
@@ -473,7 +473,7 @@ $(binariesdir)/$(XINDY_RUN) $(binariesdir)/base.mem:
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' \
+ env CLISP_LINKKIT='@CLISP_LIB@/linkkit' MAKE="$(MAKE)" \
sh '@CLISP_LIB@/clisp-link' add-module-set ordrules '@CLISP_LIB@/full' xindy-build-dir
cp xindy-build-dir/$(LISP_RUN) $(binariesdir)/$(XINDY_RUN)
cp xindy-build-dir/lispinit.mem $(binariesdir)/base.mem