Revert some changes from 2002-07-23 because they don't work on MSVC/nmake builds.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd8e2dfad3040302e58d3d3b5005119a71659a60..a1138afc4a281e453063b7a208bf936364c9e657 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-31  Juanma Barranquero  <lektu@terra.es>
+
+       * makefile.w32-in: Revert some changes from 2002-07-23 because
+       they don't work on MSVC/nmake builds.
+
 2002-07-30  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * net/tramp.el: New version 2.0.5.

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 2f9a5e1ae0c9145dbe895b84c5e6e13f26323d7d..e3d42edc8fb29edbc3a9fd9b1c895161ae407ec9 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -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