[pkgsrc/trunk]: pkgsrc/shells Fix DESTDIR-handling for zsh-current by ensurin...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/36b8c49c1d5d
branches:  trunk
changeset: 531846:36b8c49c1d5d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Aug 07 18:54:31 2007 +0000

description:
Fix DESTDIR-handling for zsh-current by ensuring that the destdir-support
line is defined before bsd.prefs.mk is included.

diffstat:

 shells/zsh-current/Makefile |  4 +---
 shells/zsh/Makefile.common  |  5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r d5ff92f77c97 -r 36b8c49c1d5d shells/zsh-current/Makefile
--- a/shells/zsh-current/Makefile       Tue Aug 07 16:20:25 2007 +0000
+++ b/shells/zsh-current/Makefile       Tue Aug 07 18:54:31 2007 +0000
@@ -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 -r d5ff92f77c97 -r 36b8c49c1d5d shells/zsh/Makefile.common
--- a/shells/zsh/Makefile.common        Tue Aug 07 16:20:25 2007 +0000
+++ b/shells/zsh/Makefile.common        Tue Aug 07 18:54:31 2007 +0000
@@ -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 @@
 
 .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])