Fix reversed logic for setting INSTALL_TARGET=install-strip. Of course,

we want to strip when STRIPFLAGS contains "-s" and not otherwise.  Pointed
out by Amatai Schlair in private e-mail.

5 files changed, 10 insertions, 20 deletions

diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
index fbacd86997a..fa751548459 100644
--- a/mail/courier-auth/Makefile
+++ b/mail/courier-auth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/01/27 23:47:08 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/02/03 13:38:38 jlam Exp $
 
 PKGNAME=	courier-auth-${BASE_VERS}
 PKGREVISION?=	1
@@ -14,10 +14,8 @@ REPLACE_PERL=		sysconftool
 
 .include "../../mail/courier-auth/Makefile.authdaemond"
 
-.if !defined(STRIPFLAG) || empty(STRIPFLAG:M-s)
+.if defined(STRIPFLAG) && !empty(STRIPFLAG:M-s)
 INSTALL_TARGET=		install-strip
-.else
-INSTALL_TARGET=		install
 .endif
 
 GEN_FILES=		authdaemonrc
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index ca8f3d983de..ff0ec2c53c7 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/01/23 02:22:20 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/02/03 13:38:38 jlam Exp $
 
 DISTNAME=	courier-imap-1.4.2
 PKGREVISION=	1
@@ -16,10 +16,8 @@ REPLACE_PERL=		sysconftool
 
 CONFIGURE_ENV+=		OPENSSL=${BUILDLINK_PREFIX.openssl}/bin/openssl
 
-.if !defined(STRIPFLAG) || empty(STRIPFLAG:M-s)
+.if defined(STRIPFLAG) && !empty(STRIPFLAG:M-s)
 INSTALL_TARGET=         install-strip
-.else
-INSTALL_TARGET=         install
 .endif
 
 SYSCONFTOOL=		${PREFIX}/sbin/imapd.sysconftool
diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile
index 6a08ca1bb8a..f33976932cc 100644
--- a/mail/courier-maildirmake/Makefile
+++ b/mail/courier-maildirmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/01/23 02:21:20 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/02/03 13:38:39 jlam Exp $
 
 PKGNAME=	courier-maildirmake-${BASE_VERS}
 PKGREVISION?=	1
@@ -21,10 +21,8 @@ WRKSRC_SUBDIRS+=	maildir
 EXTRACT_ELEMENTS=	${WRKSRC_FILES:S/^/${DISTNAME}\//}
 EXTRACT_ELEMENTS+=	${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
 
-.if !defined(STRIPFLAG) || empty(STRIPFLAG:M-s)
+.if defined(STRIPFLAG) && !empty(STRIPFLAG:M-s)
 INSTALL_TARGET=		install-strip
-.else
-INSTALL_TARGET=		install
 .endif
 
 CONF_FILES=		${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 7e83230cde9..43523d5a1e6 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/01/23 00:15:20 taca Exp $
+# $NetBSD: Makefile,v 1.8 2002/02/03 13:38:39 jlam Exp $
 
 DISTNAME=	maildrop-1.3.7
 COMMENT=	Courier mail delivery agent with filtering abilities
@@ -15,10 +15,8 @@ USE_BUILDLINK_ONLY=	yes
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--disable-userdb
 
-.if !defined(STRIPFLAG) || empty(STRIPFLAG:M-s)
+.if defined(STRIPFLAG) && !empty(STRIPFLAG:M-s)
 INSTALL_TARGET=		install-strip
-.else
-INSTALL_TARGET=		install
 .endif
 
 post-install:
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index b0f154bcc8b..f8c7a9244ab 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/01/25 00:18:59 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/02/03 13:38:39 jlam Exp $
 
 DISTNAME=	sqwebmail-3.3.1
 CATEGORIES=	www
@@ -14,10 +14,8 @@ REPLACE_PERL=		sysconftool
 
 .include "../../mail/courier-auth/Makefile.common"
 
-.if !defined(STRIPFLAG) || empty(STRIPFLAG:M-s)
+.if defined(STRIPFLAG) && !empty(STRIPFLAG:M-s)
 INSTALL_TARGET=         install-strip
-.else
-INSTALL_TARGET=         install
 .endif
 
 MAIL_GROUP?=	mail