2 files changed, 7 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1138afc4a2..098784d8161 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,9 @@
 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.
+        * makefile.w32-in: Revert some changes from 2002-07-23 because they
+        don't work on MSVC/nmake builds.
+        (update-subdirs-CMD): Generate the right list of subdirectories.  From
+        Tak Ota <Takaaki.Ota@am.sony.com>.
 
 2002-07-30  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index e3d42edc8fb..a2c2be48b13 100644
--- 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); \