From 16db7979e705ec0db5b8987eec654b91e3fce1f8 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Sat, 20 Sep 2014 20:39:36 +0100 Subject: 33213: try to get fixed fpath dir right this time --- configure.ac | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'configure.ac') 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])]) -- cgit 1.4.1