about summary refs log tree commit diff
path: root/configure.ac
diff options
context:
space:
mode:
authorPeter Stephenson <p.w.stephenson@ntlworld.com>2014-09-20 20:39:36 +0100
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2014-09-20 20:39:36 +0100
commit16db7979e705ec0db5b8987eec654b91e3fce1f8 (patch)
tree972516cac1693769157a4eb0a8e67224edc95849 /configure.ac
parent0c7a3d68644d9bc0449cdd1bd212fdefbbbf44ba (diff)
downloadzsh-16db7979e705ec0db5b8987eec654b91e3fce1f8.tar.gz
zsh-16db7979e705ec0db5b8987eec654b91e3fce1f8.tar.xz
zsh-16db7979e705ec0db5b8987eec654b91e3fce1f8.zip
33213: try to get fixed fpath dir right this time
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac13
1 files changed, 4 insertions, 9 deletions
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])])