(compile, bootstrap-compile): don't use setwins: I'm an idiot.

diff --git a/lisp/Makefile b/lisp/Makefile
index c6f16a8644572ca24f09a8b9b2a325067f16aad1..73f80bf711163d4ed2d1e6734bea0d8b97face79 100644 (file)
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -112,8 +112,14 @@ TAGS-LISP: $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2)
 compile: doit
        wd=`pwd`;                                               \
        find $$wd -name "*.elc" -print | xargs chmod +w;        \
-       $(setwins);                                             \
-       loadpath="(setq load-path '($$wins))";                  \
+       subdirs=`find $$wd -type d -print`;                     \
+       for dir in $$subdirs; do                                \
+          case $$dir in                                        \
+            */Old | */RCS | */CVS | */=* ) ;;                  \
+            *) loadpath="$$loadpath \"$$dir\"" ;;              \
+          esac;                                                \
+        done;                                                  \
+       loadpath="(setq load-path '($$loadpath))";              \
        dont_compile=`echo $(DONTCOMPILE)`;                     \
        for el in $(EL); do                                     \
          compile_it=y;                                         \
@@ -123,6 +129,7 @@ compile: doit
             fi;                                                        \
           done;                                                        \
           if test $$compile_it = y; then                       \
+            echo $(emacs) --eval "$$loadpath" -f batch-byte-compile $$el; \
             $(emacs) --eval "$$loadpath" -f batch-byte-compile $$el; \
           else                                                 \
             echo "Don't compile $$el";                         \
@@ -136,8 +143,14 @@ compile: doit
 bootstrap-compile: doit
        wd=`pwd`;                                               \
        find $$wd -name "*.elc" -print | xargs rm -f            \
-       $(setwins);                                             \
-       loadpath="(setq load-path '($$wins))";                  \
+       subdirs=`find $$wd -type d -print`;                     \
+       for dir in $$subdirs; do                                \
+          case $$dir in                                        \
+            */Old | */RCS | */CVS | */=* ) ;;                  \
+            *) loadpath="$$loadpath \"$$dir\"" ;;              \
+          esac;                                                \
+        done;                                                  \
+       loadpath="(setq load-path '($$loadpath))";              \
        dont_compile=`echo $(DONTCOMPILE)`;                     \
        for el in $(EL); do                                     \
          compile_it=y;                                         \