(setwins): abstract out the command to find subdirectories

and fix it to also ignore subdirectories of CVS (f.ex. CVS/Base).
(custom-deps, finder-data, autoloads, update-subdirs, updates): use it.

1 files changed, 13 insertions, 30 deletions

diff --git a/lisp/Makefile b/lisp/Makefile
index 23b7bee8a5a..4c39540bbb4 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -50,57 +50,40 @@ emacs = $(EMACS) $(EMACSOPT)
 
 temacs=../src/temacs -batch -l ./loadup.el 
 
+# Common command to find subdirectories
 
-doit:
-
-custom-deps: doit
-        subdirs=`find . -type d -print`; \
+setwins=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
-           case $$file in */Old | */RCS | */CVS | */=* ) ;; \
+           case $$file in */Old | */RCS | */CVS | */CVS/* | */=* ) ;; \
                 *) wins="$$wins $$file" ;; \
            esac; \
-        done; \
+        done
+
+doit:
+
+custom-deps: doit
+        $(setwins); \
         echo Directories: $$wins; \
         $(emacs) -l cus-dep -f custom-make-dependencies $$wins
 
 finder-data: doit
-        subdirs=`find . -type d -print`; \
-        for file in $$subdirs; do \
-           case $$file in */Old | */RCS | */CVS | */=* ) ;; \
-                *) wins="$$wins $$file" ;; \
-           esac; \
-        done; \
+        $(setwins); \
         echo Directories: $$wins; \
         $(emacs) -l finder -f finder-compile-keywords-make-dist $$wins
 
 autoloads: doit
-        subdirs=`find . -type d -print`; \
-        for file in $$subdirs; do \
-           case $$file in */Old | */RCS | */CVS | */=* ) ;; \
-                *) wins="$$wins $$file" ;; \
-           esac; \
-        done; \
+        $(setwins); \
         echo Directories: $$wins; \
         $(emacs) -f batch-update-autoloads $$wins
 
 update-subdirs: doit
-        subdirs=`find . -type d -print`; \
-        for file in $$subdirs; do \
-           case $$file in */Old | */RCS | */CVS | */=* ) ;; \
-                *) wins="$$wins $$file" ;; \
-           esac; \
-        done; \
+        $(setwins); \
         for file in $$wins; do \
            ../update-subdirs $$file; \
         done;
 
 updates: doit
-        subdirs=`find . -type d -print`; \
-        for file in $$subdirs; do \
-           case $$file in */Old | */RCS | */CVS | */=* ) ;; \
-                *) wins="$$wins $$file" ;; \
-           esac; \
-        done; \
+        $(setwins); \
         for file in $$wins; do \
            ../update-subdirs $$file; \
         done; \