Mercurial > emacs
changeset 107457:8d710e332ba0
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.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Mon, 22 Mar 2010 08:50:40 +0100 |
| parents | e090b66f115c |
| children | d5b2d5a7cad9 1e30c1690fd8 |
| files | lisp/ChangeLog lisp/Makefile.in |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Mar 22 08:34:25 2010 +0100 +++ b/lisp/ChangeLog Mon Mar 22 08:50:40 2010 +0100 @@ -1,3 +1,9 @@ +2010-03-22 Jan Djärv <jan.h.d@swipnet.se> + + * 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 <monnier@iro.umontreal.ca> Get rid of the ELCFILES abomination, again.
--- a/lisp/Makefile.in Mon Mar 22 08:34:25 2010 +0100 +++ b/lisp/Makefile.in Mon Mar 22 08:50:40 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