From: Guilherme Salazar <gmesalazar@gmail.com>
To: Daniel Shahaf <d.s@daniel.shahaf.name>
Cc: zsh-workers@zsh.org, Baptiste Daroussin <baptiste.daroussin@gmail.com>
Subject: Re: zsh make(1) completion on FreeBSD
Date: Tue, 11 Oct 2016 21:24:16 -0300 [thread overview]
Message-ID: <CA+Hmt2hoe-w2iQTi9yfK3kfT7PB6Oc_VKyk57OK2bgBXOgXczA@mail.gmail.com> (raw)
In-Reply-To: <20161012000249.GA32367@fujitsu.shahaf.local2>
[-- Attachment #1: Type: text/plain, Size: 521 bytes --]
> The correct way to quote $words[1] would have been «${(q)words[1]}», but
> elements of $words are already command-line quoted so they don't need to
> be quoted again. That is: just using $words[1] directly would be correct.
> (modulo noglob, but don't worry about that)
Thank you for the explanation.
If one's make points to gmake instead of bmake, $words[1] itself will
not be gmake. New patch attached fixes that, by looking for GNU in
`$words[1] -v`. Sorry about that, didn't think about it before ;p
[-- Attachment #2: _make.diff --]
[-- Type: text/plain, Size: 847 bytes --]
--- /usr/ports/shells/zsh/work/zsh-5.2/Completion/Unix/Command/_make 2015-08-08 14:51:33.000000000 -0300
+++ /usr/local/share/zsh/5.2/functions/Completion/Unix/_make 2016-10-11 21:15:56.295311000 -0300
@@ -268,7 +268,14 @@
else
case "$OSTYPE" in
freebsd*)
- _make-parseMakefile $PWD < <(_call_program targets "$words[1]" -nsp -f "$file" .PHONY 2> /dev/null)
+ if [[ `$words[1] -v 2> /dev/null` == *'GNU'* ]]
+ then
+ args="-nsp"
+ else
+ args="-nsdg1Fstdout"
+ TARGETS+=(${=${(f)"$(_call_program targets \"$words[1]\" -s -f "$file" -V.ALLTARGETS 2> /dev/null)"}})
+ fi
+ _make-parseMakefile $PWD < <(_call_program targets "$words[1]" $args -f "$file" .PHONY 2> /dev/null)
;;
*)
_make-parseMakefile $PWD < $file
next prev parent reply other threads:[~2016-10-12 0:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-06 2:56 Guilherme Salazar
2016-10-11 21:21 ` Daniel Shahaf
2016-10-11 23:27 ` Guilherme Salazar
2016-10-12 0:02 ` Daniel Shahaf
2016-10-12 0:24 ` Guilherme Salazar [this message]
2016-10-12 0:36 ` Daniel Shahaf
2016-10-12 1:14 ` Guilherme Salazar
2016-10-12 3:27 ` Guilherme Salazar
2016-10-13 10:08 ` Oliver Kiddle
2016-10-14 6:10 ` Daniel Shahaf
2016-10-16 16:34 ` Daniel Shahaf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CA+Hmt2hoe-w2iQTi9yfK3kfT7PB6Oc_VKyk57OK2bgBXOgXczA@mail.gmail.com \
--to=gmesalazar@gmail.com \
--cc=baptiste.daroussin@gmail.com \
--cc=d.s@daniel.shahaf.name \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).