From 835e2c65be490714924f9219d3dae461e4237b86 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 22 Mar 2010 08:50:40 +0100 Subject: [PATCH] Makefile.in (compile-main): cd to $(lisp) in a sub-shell, so we don't do make there. When compiling with separate object dir, there is no Makefile there. --- lisp/ChangeLog | 6 ++++++ lisp/Makefile.in | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1c2305b61b4..2a059b8167b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-03-22 Jan Djärv + + * Makefile.in (compile-main): cd to $(lisp) in a sub-shell, so we + don't do make there. When compiling with separate object dir, there + is no Makefile there. + 2010-03-22 Stefan Monnier Get rid of the ELCFILES abomination, again. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index cc91894c01c..f1219a807c7 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -236,13 +236,13 @@ compile-targets: $(TARGETS) # Compile all the Elisp files that need it. Beware: it approximates # `no-byte-compile', so watch out for false-positives! compile-main: - @cd $(lisp); $(setwins); \ + @(cd $(lisp); $(setwins); \ els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \ for el in $$els; do \ test -f $$el || continue; \ test ! -f $${el}c && GREP_OPTIONS= grep '^;.*no-byte-compile: t' $$el > /dev/null && continue; \ echo "$${el}c"; \ - done | xargs echo | \ + done | xargs echo) | \ while read chunk; do \ $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ done -- 2.11.4.GIT