[Emacs-diffs] /srv/bzr/emacs/trunk r99717: * Makefile.in (compile-main): cd to $(lisp) in a sub-shell, so we

[Jan D.]

------------------------------------------------------------
revno: 99717 [merge]
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Mon 2010-03-22 08:51:19 +0100
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/Makefile.in

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-22 04:24:25 +0000
+++ b/lisp/ChangeLog    2010-03-22 07:50:40 +0000
@@ -1,3 +1,9 @@
+2010-03-22  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        Get rid of the ELCFILES abomination, again.

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2010-03-22 04:24:25 +0000
+++ b/lisp/Makefile.in  2010-03-22 07:50:40 +0000
@@ -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