From: Peter Stephenson <p.w.stephenson@ntlworld.com>
To: "Zsh Hackers' List" <zsh-workers@zsh.org>
Subject: Re: The default $fpath
Date: Sat, 20 Sep 2014 20:36:48 +0100 [thread overview]
Message-ID: <20140920203648.092f2c39@pws-pc.ntlworld.com> (raw)
In-Reply-To: <20140920200423.1959bc8c@pws-pc.ntlworld.com>
On Sat, 20 Sep 2014 20:04:23 +0100
Peter Stephenson <p.w.stephenson@ntlworld.com> wrote:
> +dnl Add /usr/local/share/zsh/site-functions if not yet present.
> +dnl It might be present owing to an explicit sitefndir or the install
> +dnl prefix if the shell is installed under the name "zsh".
> +if test X$sitefndir = X/usr/local/zsh/site-functions
> +then fixed_sitefndir=''
> +elif test X$ac_default_prefix != X/usr/local
> +then fixed_sitefndir=/usr/local/zsh/site-functions
> +elif test X$tzsh_name != Xzsh
> +then fixed_sitefndir=/usr/local/zsh/site-functions
> +else fixed_sitefndir=''
> +fi
> +
ac_default_prefix is always /usr/local, it's not the --prefix.
But surely the only place we're ever likely to get an other copy of the
directory from is $sitefndir, whether set explicitly or based on the
prefix?
Also missed a substitution.
Also, somehow, got the wrong directory, missing out the "share".
But apart from that...
diff --git a/Config/defs.mk.in b/Config/defs.mk.in
index f6ea5c1..3c84610 100644
--- a/Config/defs.mk.in
+++ b/Config/defs.mk.in
@@ -47,6 +47,7 @@ mandir = @mandir@
datarootdir = @datarootdir@
datadir = @datadir@
fndir = @fndir@
+fixed_sitefndir = @fixed_sitefndir@
sitefndir = @sitefndir@
scriptdir = @scriptdir@
sitescriptdir = @sitescriptdir@
diff --git a/configure.ac b/configure.ac
index 68a2e91..b202940 100644
--- a/configure.ac
+++ b/configure.ac
@@ -315,16 +315,11 @@ else
sitefndir="$enableval"
fi], [sitefndir=${datadir}/${tzsh_name}/site-functions])
-dnl Add /usr/local/share/zsh/site-functions if not yet present.
-dnl It might be present owing to an explicit sitefndir or the install
-dnl prefix if the shell is installed under the name "zsh".
-if test X$sitefndir = X/usr/local/zsh/site-functions
+dnl Add /usr/local/share/zsh/site-functions if not yet present
+dnl owing to $sitefndir, whether or not explicitly given.
+if test X$sitefndir = X/usr/local/share/zsh/site-functions
then fixed_sitefndir=''
-elif test X$ac_default_prefix != X/usr/local
-then fixed_sitefndir=/usr/local/zsh/site-functions
-elif test X$tzsh_name != Xzsh
-then fixed_sitefndir=/usr/local/zsh/site-functions
-else fixed_sitefndir=''
+else fixed_sitefndir=/usr/local/share/zsh/site-functions
fi
ifdef([function_subdirs],[undefine([function_subdirs])])
next prev parent reply other threads:[~2014-09-20 19:37 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-06 12:00 Tanu Kaskinen
2014-09-06 16:06 ` Frank Terbeck
2014-09-06 18:45 ` Peter Stephenson
2014-09-06 19:10 ` Frank Terbeck
2014-09-06 23:04 ` Peter Stephenson
2014-09-07 3:44 ` Bart Schaefer
2014-09-07 18:31 ` Peter Stephenson
2014-09-07 19:37 ` Vin Shelton
2014-09-07 19:53 ` Tanu Kaskinen
2014-09-07 20:40 ` Peter Stephenson
2014-09-07 21:01 ` Bart Schaefer
2014-09-08 10:23 ` Peter Stephenson
2014-09-08 11:16 ` Frank Terbeck
2014-09-20 19:04 ` Peter Stephenson
2014-09-20 19:36 ` Peter Stephenson [this message]
2014-09-20 20:00 ` Peter Stephenson
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=20140920203648.092f2c39@pws-pc.ntlworld.com \
--to=p.w.stephenson@ntlworld.com \
--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).