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:14:09 +0100
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2014-09-20 20:14:09 +0100
commit0c7a3d68644d9bc0449cdd1bd212fdefbbbf44ba (patch)
tree48145916b54c8c0dfdd6cffeb6f6f759ef018f4e /configure.ac
parentf4aae44162e4b91f14e8f2d09f65ccc4e7c66dd7 (diff)
downloadzsh-0c7a3d68644d9bc0449cdd1bd212fdefbbbf44ba.tar.gz
zsh-0c7a3d68644d9bc0449cdd1bd212fdefbbbf44ba.tar.xz
zsh-0c7a3d68644d9bc0449cdd1bd212fdefbbbf44ba.zip
33212: try to put /usr/local/share/zsh/site-functions in default fpath
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac13
1 files changed, 13 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 37f35858f..68a2e919f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -315,6 +315,18 @@ 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
+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
+
 ifdef([function_subdirs],[undefine([function_subdirs])])
 AC_ARG_ENABLE(function-subdirs,
 AC_HELP_STRING([--enable-function-subdirs], [install functions in subdirectories]))
@@ -340,6 +352,7 @@ AC_SUBST(runhelp)dnl
 AC_SUBST(additionalfpath)dnl
 AC_SUBST(fndir)dnl
 AC_SUBST(sitefndir)dnl
+AC_SUBST(fixed_sitefndir)dnl
 AC_SUBST(FUNCTIONS_SUBDIRS)dnl
 
 dnl Directories for scripts such as newuser.