diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 1999-10-10 19:19:48 +0000 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 1999-10-10 19:19:48 +0000 |
commit | 6f0e64299a8f02e1eb9085acfe8873cf169ddb2b (patch) | |
tree | de1df04506319b332273fbda0d2d9a48babaac92 /lisp/Makefile | |
parent | e2fa1e81c051c87ef38958d8a87eee5015e51f40 (diff) | |
download | emacs-6f0e64299a8f02e1eb9085acfe8873cf169ddb2b.tar.gz |
(compile, bootstrap-compile): don't use setwins: I'm an idiot.
Diffstat (limited to 'lisp/Makefile')
-rw-r--r-- | lisp/Makefile | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/lisp/Makefile b/lisp/Makefile index c6f16a86445..73f80bf7111 100644 --- 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; \ |