Re: More problems - functions installed as dirs (RE: Functions moved)

["Bart Schaefer" <schaefer@xxxxxxxxxxxxxxxxxxxxxxx>]

On Apr 2,  7:45pm, Andrej Borsenkow wrote:
} Subject: More problems - functions installed as dirs (RE: Functions moved)
}
} After cvs up and clean reconfigure in empty directory I got:
} 
} drwxr-xr-x   2 root     other         96 Apr  2 19:42 compaudit/
} drwxr-xr-x   2 root     other         96 Apr  2 19:42 compdump/
} drwxr-xr-x   2 root     other         96 Apr  2 19:42 compinit/
} drwxr-xr-x   2 root     other         96 Apr  2 19:42 compinstall/

% cvs -d barts@xxxxxxxxxxxxxxxxxxxxxxx:/cvsroot/zsh co -P -d new zsh
% cd new
% ./configure --enable-function-subdirs --prefix=/tmp/zshnew
% make
% make install
% ls -l /tmp/zshnew/share/zsh/4.0.1-pre-2/functions/Completion 
total 93
drwxr-xr-x   2 schaefer schaefer     1024 Apr  2 09:22 AIX/
drwxr-xr-x   2 schaefer schaefer     1024 Apr  2 09:22 BSD/
drwxr-xr-x   2 schaefer schaefer     2048 Apr  2 09:22 Base/
drwxr-xr-x   2 schaefer schaefer     1024 Apr  2 09:22 Debian/
drwxr-xr-x   2 schaefer schaefer     1024 Apr  2 09:22 Linux/
drwxr-xr-x   2 schaefer schaefer     1024 Apr  2 09:22 Redhat/
drwxr-xr-x   2 schaefer schaefer     2048 Apr  2 09:22 Unix/
drwxr-xr-x   2 schaefer schaefer     1024 Apr  2 09:22 X/
drwxr-xr-x   2 schaefer schaefer     2048 Apr  2 09:22 Zsh/
-rw-r--r--   1 schaefer schaefer     4587 Apr  2 09:22 compaudit
-rw-r--r--   1 schaefer schaefer     3952 Apr  2 09:22 compdump
-rw-r--r--   1 schaefer schaefer    14511 Apr  2 09:22 compinit
-rw-r--r--   1 schaefer schaefer    55681 Apr  2 09:22 compinstall

The only problem is:

%ls -l /tmp/zshnew/share/zsh/4.0.1-pre-2/functions/Completion/Linux
total 3
-rw-r--r--   1 schaefer schaefer       82 Apr  2 09:22 Entries
-rw-r--r--   1 schaefer schaefer       34 Apr  2 09:22 Repository
-rw-r--r--   1 schaefer schaefer       43 Apr  2 09:22 Root

It missed _apm entirely (because it's not in a sub-subdirectory, I guess)
and every one of the other directories got the files from its CVS subdir
installed.  That didn't happen before ...

Index: Config/installfns.sh
===================================================================
RCS file: /cvsroot/zsh/zsh/Config/installfns.sh,v
retrieving revision 1.6
diff -u -r1.6 installfns.sh
--- Config/installfns.sh	2001/04/02 14:36:38	1.6
+++ Config/installfns.sh	2001/04/02 16:43:04
@@ -15,6 +15,7 @@
   if test -f $sdir_top/$file; then
     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"

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net