mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 22:11:54 +02:00
Code Releases Activity

34723: disable fixed site function dir if user disable site function dir

Browse source
This commit is contained in:
Peter Stephenson 2015-03-18 09:20:44 +00:00
parent 55fe20cc17
commit 0b00462644
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-03-18 Peter Stephenson <p.stephenson@samsung.com>
* 34723: configure.ac: turn off fixed site function directory if
site function directory explicitly disabled.
2015-03-17 Peter Stephenson <p.stephenson@samsung.com>
* unposted: NEWS: rewrite the foregoing.

3
configure.ac
View file

@ -318,7 +318,8 @@ 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
if test X$sitefndir = X/usr/local/share/zsh/site-functions || \
test X$sitefndir = Xno
then fixed_sitefndir=''
elif test X$prefix != X/usr/local; then
if test X$prefix = XNONE && test X$ac_default_prefix = X/usr/local; then