From 16db7979e705ec0db5b8987eec654b91e3fce1f8 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <p.w.stephenson@ntlworld.com>
Date: Sat, 20 Sep 2014 20:39:36 +0100
Subject: 33213: try to get fixed fpath dir right this time

---
 ChangeLog         |  2 ++
 Config/defs.mk.in |  1 +
 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])])
-- 
cgit 1.4.1