mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-19 11:31:26 +01:00
Code Releases Activity

33214 (modified further): test prefixes for site fpath better

Browse source
This commit is contained in:
Peter Stephenson 2014-09-20 21:07:44 +01:00
parent 16db7979e7
commit e171c19320
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
2014-09-20 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 33214 (modified yet further): configure.ac: test prefixes better.
* 33213: configure.ac, Config/defs.mk.in: try again.
* 33212: Src/zsh.mdd: Src/init.c, Src/zsh.mdd, configure.ac: add

13
configure.ac
View file

@ -317,9 +317,20 @@ fi], [sitefndir=${datadir}/${tzsh_name}/site-functions])
dnl Add /usr/local/share/zsh/site-functions if not yet present
dnl owing to $sitefndir, whether or not explicitly given.
dnl If not explicitly given, it hasn't been expanded yet.
if test X$sitefndir = X/usr/local/share/zsh/site-functions
then fixed_sitefndir=''
else fixed_sitefndir=/usr/local/share/zsh/site-functions
elif test X$prefix != X/usr/local; then
if test X$prefix = XNONE && test X$ac_default_prefix = X/usr/local; then
if test X$tzsh_name != Xzsh
then fixed_sitefndir=/usr/local/share/zsh/site-functions
else fixed_sitefndir=''
fi
else fixed_sitefndir=/usr/local/share/zsh/site-functions
fi
elif test X$tzsh_name != Xzsh
then fixed_sitefndir=/usr/local/share/zsh/site-functions
else fixed_sitefndir=''
fi
ifdef([function_subdirs],[undefine([function_subdirs])])