From 867db9cd9e81ff658b30b0fb04e958bb77046a7b Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Mon, 13 Aug 2007 19:43:30 +0000
Subject: Compare "MKDYNAMICROOT" with "no" to figure out the desirable static
 linking behavior under NetBSD. This matches what "bsd.shlib.mk" does and
 avoids "Malformed conditional" warnings under other platforms. This fixes PR
 pkg/36769 by Yakovetsky Vladimir.

---
 shells/zsh/Makefile.common | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'shells')

diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index f5ad2d1edc9..4790e59fe37 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2007/08/07 18:54:31 jlam Exp $
+# $NetBSD: Makefile.common,v 1.41 2007/08/13 19:43:30 tron Exp $
 
 DISTNAME=	zsh-${ZSH_VERSION}
 CATEGORIES=	shells
@@ -38,9 +38,11 @@ CONFIGURE_ARGS+=	--disable-dynamic
 NETBSD_SHLINKER=	/libexec/ld.elf_so
 NETBSD_SHLIBDIR=	/lib
 
-.  if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF" && \
-      defined(MKDYNAMICROOT) && !empty(MKDYNAMICROOT:M[Yy][Ee][Ss]) && \
-      exists(${NETBSD_SHLINKER}) && exists(${NETBSD_SHLIBDIR})
+.  if ${OPSYS} == "NetBSD" && \
+      defined(OBJECT_FMT) && ${OBJECT_FMT} == "ELF" && \
+      defined(MKDYNAMICROOT) && ${MKDYNAMICROOT} != "no" && \
+      defined(NETBSD_SHLINKER) && exists(${NETBSD_SHLINKER}) && \
+      defined(NETBSD_SHLIBDIR) && exists(${NETBSD_SHLIBDIR})
 #
 # Built a dynamically linked "zsh" binary on NetBSD systems which use
 # dynamically linked binaries on the root filesystem. The binary will
-- 
cgit v1.2.3