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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c2305b61b4962ead60b9945d4b0eb77314562c4..2a059b8167bb3885b7abec54f01ac86763802c3d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index cc91894c01c9b7835e2201369ba5c034749ffb18..f1219a807c76ce3ac84c6263a4f54d052bef4061 100644 (file)
--- 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