diff options
| author | Stefan Monnier | 1999-10-10 19:19:48 +0000 |
|---|---|---|
| committer | Stefan Monnier | 1999-10-10 19:19:48 +0000 |
| commit | 6f0e64299a8f02e1eb9085acfe8873cf169ddb2b (patch) | |
| tree | de1df04506319b332273fbda0d2d9a48babaac92 | |
| parent | e2fa1e81c051c87ef38958d8a87eee5015e51f40 (diff) | |
| download | emacs-6f0e64299a8f02e1eb9085acfe8873cf169ddb2b.tar.gz emacs-6f0e64299a8f02e1eb9085acfe8873cf169ddb2b.zip | |
(compile, bootstrap-compile): don't use setwins: I'm an idiot.
| -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) | |||
| 112 | compile: doit | 112 | compile: doit |
| 113 | wd=`pwd`; \ | 113 | wd=`pwd`; \ |
| 114 | find $$wd -name "*.elc" -print | xargs chmod +w; \ | 114 | find $$wd -name "*.elc" -print | xargs chmod +w; \ |
| 115 | $(setwins); \ | 115 | subdirs=`find $$wd -type d -print`; \ |
| 116 | loadpath="(setq load-path '($$wins))"; \ | 116 | for dir in $$subdirs; do \ |
| 117 | case $$dir in \ | ||
| 118 | */Old | */RCS | */CVS | */=* ) ;; \ | ||
| 119 | *) loadpath="$$loadpath \"$$dir\"" ;; \ | ||
| 120 | esac; \ | ||
| 121 | done; \ | ||
| 122 | loadpath="(setq load-path '($$loadpath))"; \ | ||
| 117 | dont_compile=`echo $(DONTCOMPILE)`; \ | 123 | dont_compile=`echo $(DONTCOMPILE)`; \ |
| 118 | for el in $(EL); do \ | 124 | for el in $(EL); do \ |
| 119 | compile_it=y; \ | 125 | compile_it=y; \ |
| @@ -123,6 +129,7 @@ compile: doit | |||
| 123 | fi; \ | 129 | fi; \ |
| 124 | done; \ | 130 | done; \ |
| 125 | if test $$compile_it = y; then \ | 131 | if test $$compile_it = y; then \ |
| 132 | echo $(emacs) --eval "$$loadpath" -f batch-byte-compile $$el; \ | ||
| 126 | $(emacs) --eval "$$loadpath" -f batch-byte-compile $$el; \ | 133 | $(emacs) --eval "$$loadpath" -f batch-byte-compile $$el; \ |
| 127 | else \ | 134 | else \ |
| 128 | echo "Don't compile $$el"; \ | 135 | echo "Don't compile $$el"; \ |
| @@ -136,8 +143,14 @@ compile: doit | |||
| 136 | bootstrap-compile: doit | 143 | bootstrap-compile: doit |
| 137 | wd=`pwd`; \ | 144 | wd=`pwd`; \ |
| 138 | find $$wd -name "*.elc" -print | xargs rm -f \ | 145 | find $$wd -name "*.elc" -print | xargs rm -f \ |
| 139 | $(setwins); \ | 146 | subdirs=`find $$wd -type d -print`; \ |
| 140 | loadpath="(setq load-path '($$wins))"; \ | 147 | for dir in $$subdirs; do \ |
| 148 | case $$dir in \ | ||
| 149 | */Old | */RCS | */CVS | */=* ) ;; \ | ||
| 150 | *) loadpath="$$loadpath \"$$dir\"" ;; \ | ||
| 151 | esac; \ | ||
| 152 | done; \ | ||
| 153 | loadpath="(setq load-path '($$loadpath))"; \ | ||
| 141 | dont_compile=`echo $(DONTCOMPILE)`; \ | 154 | dont_compile=`echo $(DONTCOMPILE)`; \ |
| 142 | for el in $(EL); do \ | 155 | for el in $(EL); do \ |
| 143 | compile_it=y; \ | 156 | compile_it=y; \ |