diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-09-20 20:39:36 +0100 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-09-20 20:39:36 +0100 |
| commit | 16db7979e705ec0db5b8987eec654b91e3fce1f8 (patch) | |
| tree | 972516cac1693769157a4eb0a8e67224edc95849 | |
| parent | 0c7a3d68644d9bc0449cdd1bd212fdefbbbf44ba (diff) | |
| download | zsh-16db7979e705ec0db5b8987eec654b91e3fce1f8.tar.gz zsh-16db7979e705ec0db5b8987eec654b91e3fce1f8.tar.xz zsh-16db7979e705ec0db5b8987eec654b91e3fce1f8.zip | |
33213: try to get fixed fpath dir right this time
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Config/defs.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 13 |
3 files changed, 7 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 3c5aa6126..0788d9338 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-09-20 Peter Stephenson <p.w.stephenson@ntlworld.com> + * 33213: configure.ac, Config/defs.mk.in: try again. + * 33212: Src/zsh.mdd: Src/init.c, Src/zsh.mdd, configure.ac: add /usr/local/share/zsh/site-functions to head of fpath if not present in configurable. Not configurable as serves as fallback diff --git a/Config/defs.mk.in b/Config/defs.mk.in index f6ea5c1cd..3c84610e8 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 68a2e919f..b20294043 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])]) |