(update-subdirs-CMD): Generate the right list of subdirectories. From

[gnu-emacs] / lisp / makefile.w32-in

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 2f9a5e1ae0c9145dbe895b84c5e6e13f26323d7d..a2c2be48b13c8d168f03e7ecd1c09de4bd6e9ea0 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -195,11 +195,11 @@ subdirs.el:
 update-subdirs: update-subdirs-$(SHELLTYPE)
 
 update-subdirs-CMD: doit
-       @set QWINS=
-       @for %d in ($(WINS)) do if not (%d)==(term) set QWINS=%QWINS% "%d"
        echo ;; In load-path, after this directory should come> subdirs.el
        echo ;; certain of its subdirectories.  Here we specify them.>> subdirs.el
-       echo (normal-top-level-add-to-load-path $(SQUOTE)(%QWINS%))>> subdirs.el
+       echo (normal-top-level-add-to-load-path $(SQUOTE)(>> subdirs.el
+       @for %d in ($(WINS)) do if not (%d)==(term) echo "%d">> subdirs.el
+       echo ))>> subdirs.el
 
 update-subdirs-SH: doit
        wd=$(lisp); $(setwins); \
@@ -240,18 +240,14 @@ $(DONTCOMPILE:.el=.elc):
 # load's in the files being compiled find the right files.
 
 # Need separate version for sh and native cmd.exe
-compile: subdirs.el compile-$(SHELLTYPE) doit
+compile-files: subdirs.el compile-files-$(SHELLTYPE) doit
 
-compile-CMD:
+compile-files-CMD:
 #      -for %f in ($(lisp) $(WINS)) do for %g in (%f\*.elc) do @attrib -r %g
-       for %f in ($(COMPILE_FIRST)) do \
-         if not exist %f \
-           $(emacs) -f batch-byte-compile-if-not-done %f
-       for %f in (. $(WINS)) do for %g in (%f/*.el) do \
-         if not exist %f/%g \
-           $(emacs) -f batch-byte-compile-if-not-done %f/%g
-
-compile-SH:
+       for %f in ($(COMPILE_FIRST)) do $(emacs) -f batch-byte-compile %f
+       for %f in (. $(WINS)) do for %g in (%f/*.el) do $(emacs) -f batch-byte-compile %f/%g
+
+compile-files-SH:
 #      for elc in $(lisp)/*.elc $(lisp)/*/*.elc; do attrib -r $$elc; done
        for el in $(COMPILE_FIRST); do \
          echo Compiling $$el; \
@@ -338,7 +334,7 @@ bootstrap-clean-SH:
 
 # Generate/update files for the bootstrap process.
 
-bootstrap: update-subdirs autoloads compile finder-data custom-deps
+bootstrap: autoloads compile-files finder-data custom-deps
 
 #
 # Assuming INSTALL_DIR is defined, copy the elisp files to it