15583: ignore CVS directories for a all function installations

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2db1f903c..6804251d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-07  Peter Stephenson  <pws@csr.com>
+
+	* 15583: Config/installfns.sh: ignore CVS directories for
+	all function installations, not just with subdirectories.
+
 2001-08-07  Sven Wischnowsky  <wischnow@zsh.org>
 
 	* 15584: Src/parse.c: increment zwc fie version (which means
diff --git a/Config/installfns.sh b/Config/installfns.sh
index ccbeae6d5..76d937413 100755
--- a/Config/installfns.sh
+++ b/Config/installfns.sh
@@ -13,9 +13,11 @@ allfuncs="`cd $sdir_top; echo ${allfuncs}`"
 # (1) the glob got expanded (2) we are not looking at directories.
 for file in $allfuncs; do
   if test -f $sdir_top/$file; then
+    case "$file" in
+      */CVS/*) continue;;
+    esac
     if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then
       case "$file" in
-      */CVS/*) continue;;
       Completion/comp*)
         subdir="`echo $file | sed -e 's%/[^/]*/[^/]*$%%'`"
         instdir="$fndir/Completion"