summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2007-12-10 18:05:04 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2007-12-10 18:05:04 +0000
commit72060c47b1ccb33b0c759a57ca909f6ee99ea062 (patch)
tree210eb7a9e84955f1059a67e476685b338ba8cad3
parenta124da3a4a4bf6e91a567033e1e03241d9d0faa9 (diff)
downloadzsh-72060c47b1ccb33b0c759a57ca909f6ee99ea062.tar.gz
zsh-72060c47b1ccb33b0c759a57ca909f6ee99ea062.tar.xz
zsh-72060c47b1ccb33b0c759a57ca909f6ee99ea062.zip
Vincent Lefevre: 24192: make GNU make completion support -include
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_make6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 09d34fa6c..234b01485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-10  Peter Stephenson  <pws@csr.com>
+
+	* Vincent Lefevre: 24192: Completion/Unix/Command/_make:
+	make GNU make support -include.
+
 2007-12-09  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 24150 plus unposted: Src/exec.c, Test/D08cmdsubst.ztst:
diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make
index 93d4b52da..95d7044e3 100644
--- a/Completion/Unix/Command/_make
+++ b/Completion/Unix/Command/_make
@@ -81,8 +81,8 @@ parseMakefile() {
 	    input=${input%%:*}
 	    print $(expandVars 10 $input)
 	    ;;
-	($incl *)
-	    local f=${input##$incl ##}
+	(${~incl} *)
+	    local f=${input##${~incl} ##}
 	    if [[ $incl = '.include' ]]; then
 		f=${f#[\"<]}
 		f=${f%[\">]}
@@ -125,7 +125,7 @@ findBasedir () {
 _pick_variant -r is_gnu gnu=GNU unix -v -f
 
 if [[ $is_gnu = gnu ]]; then
-    incl=include
+    incl="(-|)include"
 else
     incl=.include
 fi