diff options
| author | jlam <jlam> | 2007-08-07 18:54:31 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2007-08-07 18:54:31 +0000 |
| commit | 839d6bc5bb864ebd6fa06f8b3a47615e13354994 (patch) | |
| tree | 844b6e2e53d1030cbb2ac41b789ecf9d843cf223 | |
| parent | 1505064c761ce932799155ac564355bb1c048826 (diff) | |
| download | pkgsrc-839d6bc5bb864ebd6fa06f8b3a47615e13354994.tar.gz | |
Fix DESTDIR-handling for zsh-current by ensuring that the destdir-support
line is defined before bsd.prefs.mk is included.
| -rw-r--r-- | shells/zsh-current/Makefile | 4 | ||||
| -rw-r--r-- | shells/zsh/Makefile.common | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/shells/zsh-current/Makefile b/shells/zsh-current/Makefile index 34eeb136f85..f21ed200f59 100644 --- a/shells/zsh-current/Makefile +++ b/shells/zsh-current/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/03/18 01:02:21 uebayasi Exp $ - -.include "options.mk" +# $NetBSD: Makefile,v 1.10 2007/08/07 18:54:31 jlam Exp $ .include "../../shells/zsh/Makefile.common" diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index 0150efc0f03..f5ad2d1edc9 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.39 2007/07/20 16:36:59 joerg Exp $ +# $NetBSD: Makefile.common,v 1.40 2007/08/07 18:54:31 jlam Exp $ DISTNAME= zsh-${ZSH_VERSION} CATEGORIES= shells @@ -27,6 +27,9 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../../mk/bsd.prefs.mk" +# Handle any PKG_OPTIONS that this package might have. +.sinclude "options.mk" + BUILD_DEFS+= ZSH_STATIC .if defined(ZSH_STATIC) && !empty(ZSH_STATIC:M[Yy][Ee][Ss]) |