Completion/Zsh/CVS/* incorrectly installed as functions

Completion/Zsh/CVS/* incorrectly installed as functions

[Adam Spiers]

I just reinstalled the latest HEAD branch from CVS, without
--enable-function-subdirs for the first time in quite a
while, and I notice that I'm getting three rather suspicious
looking files called Entries, Root, and Repository appearing
in $installed/share/zsh/4.1.0-dev-1/functions.  Repository
contains `zsh/Completion/Zsh'.  Anyone know which Makefile
needs twiddling to fix that?

Re: Completion/Zsh/CVS/* incorrectly installed as functions

[Bart Schaefer]

On Aug 6,  6:32pm, Adam Spiers wrote:
} Subject: Completion/Zsh/CVS/* incorrectly installed as functions
}
} I notice that I'm getting three rather suspicious looking
} files called Entries, Root, and Repository appearing in
} $installed/share/zsh/4.1.0-dev-1/functions.

Hrm.  The makefiles are really designed for use with the packaged
tar distributions and don't do any special handling of CVS subdirs.

What would need to be twiddled is the functions= declarations in
several of the *.mdd files.

-- 
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   

PATCH: Re: Completion/Zsh/CVS/* incorrectly installed as functions

[Peter Stephenson]

"Bart Schaefer" wrote:
> On Aug 6,  6:32pm, Adam Spiers wrote:
> } Subject: Completion/Zsh/CVS/* incorrectly installed as functions
> }
> } I notice that I'm getting three rather suspicious looking
> } files called Entries, Root, and Repository appearing in
> } $installed/share/zsh/4.1.0-dev-1/functions.
> 
> Hrm.  The makefiles are really designed for use with the packaged
> tar distributions and don't do any special handling of CVS subdirs.

installfns.sh does, however, but only for function-subdirs, which needs
changing.

Index: Config/installfns.sh
===================================================================
RCS file: /cvsroot/zsh/zsh/Config/installfns.sh,v
retrieving revision 1.8
diff -u -r1.8 installfns.sh
--- Config/installfns.sh	2001/05/20 10:59:28	1.8
+++ Config/installfns.sh	2001/08/07 09:01:32
@@ -13,9 +13,11 @@
 # (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"

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR Ltd., Unit 300, Science Park, Milton Road,
Cambridge, CB4 0XL, UK                          Tel: +44 (0)1223 392070


**********************************************************************
The information transmitted is intended only for the person or
entity to which it is addressed and may contain confidential 
and/or privileged material. 
Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by 
persons or entities other than the intended recipient is 
prohibited.  
If you received this in error, please contact the sender and 
delete the material from any computer.
**********************************************************************