summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-11-24 15:46:54 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-11-24 15:46:54 +0000
commitb7c0ab63f342ea97a8aa6cd14003b66e27f946f4 (patch)
tree8a381adf904b0787ce6cfc8b767964607967dd8e
parentd81fb9f1a899e5b82814bf1f4fa488df91382bbf (diff)
downloadzsh-b7c0ab63f342ea97a8aa6cd14003b66e27f946f4.tar.gz
zsh-b7c0ab63f342ea97a8aa6cd14003b66e27f946f4.tar.xz
zsh-b7c0ab63f342ea97a8aa6cd14003b66e27f946f4.zip
Baptiste Daroussin: 27431: _make: fix for FreeBSD
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_make8
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f05d22ec..e5b074e22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-24  Peter Stephenson  <pws@csr.com>
 
+	* Baptiste Daroussin: 27431: Completion/Unix/Command/_make: Fix
+	for FreeBSD.
+
 	* 27430: Completion/Unix/Command/_make: extend variable value
 	completion to anything that looks like an assignment.
 
@@ -12393,5 +12396,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4823 $
+* $Revision: 1.4824 $
 *****************************************************
diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make
index f0d208837..e404d162d 100644
--- a/Completion/Unix/Command/_make
+++ b/Completion/Unix/Command/_make
@@ -193,7 +193,13 @@ else
     then
       parseMakefile $PWD < <(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .PHONY 2> /dev/null)
     else
-      parseMakefile $PWD < $file
+      case "$OSTYPE" in
+        freebsd*)
+        parseMakefile $PWD < <(_call_program targets "$words[1]" -nsp -f "$file" .PHONY 2> /dev/null)
+	;;
+	*)
+        parseMakefile $PWD < $file
+      esac
     fi
   fi