Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 505-522)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: etc/TUTORIAL.cn: Updated.
   - Merge from erc--emacs--22

 * gnus--rel--5.10  (patch 164-167)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-137

1 files changed, 6 insertions, 13 deletions

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 93e9141f4cc..ebecf87d220 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -70,17 +70,8 @@ COMPILE_FIRST = \
 
 emacs = "$(EMACS)" $(EMACSOPT)
 
-# Common command to find subdirectories
-
-setwins=subdirs=`find $$wd -type d -print`; \
-	for file in $$subdirs; do \
-	   case $$file in */Old | */RCS | */CVS | */CVS/* | */=* ) ;; \
-		*) wins="$$wins $$file" ;; \
-	   esac; \
-        done
-
 # Have to define the list of subdirs manually when not using sh.
-WINS=\
+WINS_ALMOST=\
 	calc \
 	calendar \
 	emacs-lisp \
@@ -93,13 +84,15 @@ WINS=\
 	mail \
 	mh-e \
 	net \
-	obsolete \
 	play \
 	progmodes \
 	term \
 	textmodes \
 	url
 
+WINS= $(WINS_ALMOST) \
+	obsolete
+
 doit:
 
 $(lisp)/cus-load.el:
@@ -163,10 +156,10 @@ loaddefs.el-CMD:
 # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
 #          this can break with GNU Make 3.81 and later if sh.exe is used.
 autoloads: $(lisp)/loaddefs.el doit
-	@echo Directories: . $(WINS)
+	@echo Directories: . $(WINS_ALMOST)
 	$(emacs) -l autoload \
 		--eval $(ARGQUOTE)(setq find-file-hook nil find-file-suppress-same-file-warnings t)$(ARGQUOTE) \
-		-f w32-batch-update-autoloads "$(lisp)/loaddefs.el" . $(WINS)
+		-f w32-batch-update-autoloads "$(lisp)/loaddefs.el" . $(WINS_ALMOST)
 
 $(lisp)/subdirs.el:
 	$(MAKE) $(MFLAGS) update-subdirs