changeset 25971:999bac80682f

(compile, bootstrap-compile): don't use setwins: I'm an idiot.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 10 Oct 1999 19:19:48 +0000
parents aba4d088f0d8
children e7205498db63
files lisp/Makefile
diffstat 1 files changed, 17 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/Makefile	Sun Oct 10 19:18:47 1999 +0000
+++ b/lisp/Makefile	Sun Oct 10 19:19:48 1999 +0000
@@ -112,8 +112,14 @@
 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 @@
             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 @@
 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;						\