diff options
| author | Oliver Kiddle <opk@users.sourceforge.net> | 2002-03-15 16:26:08 +0000 |
|---|---|---|
| committer | Oliver Kiddle <opk@users.sourceforge.net> | 2002-03-15 16:26:08 +0000 |
| commit | 79323d6d41c91860cd05800a06cf8076df5051bd (patch) | |
| tree | 0c08a2486422faa6f805589f2f60f640134b455b /Completion/Unix/Command/_make | |
| parent | 2fa33574f029358dc1597b1ff8700385d7c8332a (diff) | |
| download | zsh-79323d6d41c91860cd05800a06cf8076df5051bd.tar.gz zsh-79323d6d41c91860cd05800a06cf8076df5051bd.tar.xz zsh-79323d6d41c91860cd05800a06cf8076df5051bd.zip | |
16842: resolve name clash for nc between netcat and the nedit client for
completion and add _pick_variant to resolve program variants in general
Diffstat (limited to 'Completion/Unix/Command/_make')
| -rw-r--r-- | Completion/Unix/Command/_make | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make index df28eac60..53958c0d0 100644 --- a/Completion/Unix/Command/_make +++ b/Completion/Unix/Command/_make @@ -1,17 +1,8 @@ #compdef make gmake pmake dmake -local prev="$words[CURRENT-1]" file expl tmp +local prev="$words[CURRENT-1]" file expl tmp is_gnu -(( $+_is_gnu )) || typeset -gA _is_gnu - -if (( ! $+_is_gnu[$words[1]] )); then - if [[ $(_call_program version $words[1] -v -f /dev/null </dev/null 2>/dev/null) = *GNU* ]] - then - _is_gnu[$words[1]]=yes - else - _is_gnu[$words[1]]= - fi -fi +_pick_variant -r is_gnu gnu=GNU unix -v -f if [[ "$prev" = -[CI] ]]; then _files -/ @@ -25,14 +16,14 @@ else file=Makefile elif [[ -e makefile ]]; then file=makefile - elif [[ -n "$_is_gnu[$words[1]]" && -e GNUmakefile ]]; then + elif [[ $is_gnu = gnu && -e GNUmakefile ]]; then file=GNUmakefile else file='' fi if [[ -n "$file" ]] && _tags targets; then - if [[ -n "$_is_gnu[$words[1]]" ]] && + if [[ $is_gnu = gnu ]] && zstyle -t ":completion:${curcontext}:targets" call-command; then tmp=( $(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .PHONY 2> /dev/null | awk '/^[a-zA-Z0-9][^\/\t=]+:/ {print $1}' FS=:) ) else |