summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rwxr-xr-xConfig/installfns.sh7
-rw-r--r--Src/Zle/complete.mdd2
3 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 905f3b195..2ca20c44d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-02-13  Oliver Kiddle  <opk@zsh.org>
 
+	* 18238: Config/installfns.sh, Src/Zle/complete.mdd:
+	bashcompinit was not being installed with --enable-function-subdirs
+
 	* users/5915: Completion/Unix/Command/_ssh: two levels of quoting
 	are needed for remote files referenced with scp
 
diff --git a/Config/installfns.sh b/Config/installfns.sh
index 76d937413..8dc1214b0 100755
--- a/Config/installfns.sh
+++ b/Config/installfns.sh
@@ -18,13 +18,12 @@ for file in $allfuncs; do
     esac
     if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then
       case "$file" in
-      Completion/comp*)
+      Completion/*/*)
         subdir="`echo $file | sed -e 's%/[^/]*/[^/]*$%%'`"
-        instdir="$fndir/Completion"
+        instdir="$fndir/$subdir"
         ;;
       Completion/*)
-        subdir="`echo $file | sed -e 's%/[^/]*/[^/]*$%%'`"
-        instdir="$fndir/$subdir"
+        instdir="$fndir/Completion"
         ;;
       *)
         subdir="`echo $file | sed -e 's%/[^/]*$%%' -e 's%^Functions/%%'`"
diff --git a/Src/Zle/complete.mdd b/Src/Zle/complete.mdd
index eea9645dc..ea9d5f5f6 100644
--- a/Src/Zle/complete.mdd
+++ b/Src/Zle/complete.mdd
@@ -1,7 +1,7 @@
 name=zsh/complete
 link=either
 load=yes
-functions='Completion/comp* Completion/AIX/*/* Completion/BSD/*/* Completion/Base/*/* Completion/Debian/*/* Completion/Linux/*/* Completion/Mandrake/*/* Completion/Redhat/*/* Completion/Unix/*/* Completion/X/*/* Completion/Zsh/*/*'
+functions='Completion/*comp* Completion/AIX/*/* Completion/BSD/*/* Completion/Base/*/* Completion/Debian/*/* Completion/Linux/*/* Completion/Mandrake/*/* Completion/Redhat/*/* Completion/Unix/*/* Completion/X/*/* Completion/Zsh/*/*'
 
 moddeps="zsh/zle"