# HG changeset patch # User Jan D. # Date 1269244279 -3600 # Node ID d5b2d5a7cad9fec89ec0712268e6b4321cb2d511 # Parent 0dacd026695fdea495d66e31cd87813fbac52909# Parent 8d710e332ba0a43c08ad947f5a4e8f52d4261fba * 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. diff -r 0dacd026695f -r d5b2d5a7cad9 lisp/ChangeLog --- a/lisp/ChangeLog Mon Mar 22 00:24:25 2010 -0400 +++ b/lisp/ChangeLog Mon Mar 22 08:51:19 2010 +0100 @@ -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 -r 0dacd026695f -r d5b2d5a7cad9 lisp/Makefile.in --- a/lisp/Makefile.in Mon Mar 22 00:24:25 2010 -0400 +++ b/lisp/Makefile.in Mon Mar 22 08:51:19 2010 +0100 @@ -236,13 +236,13 @@ # 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