From fee0a809ced72a6c56fad1e54b0e42455aedf0a2 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 5 Feb 2004 03:39:17 +0000
Subject: Simpilfy the test for whether we're inside bsd.prefs.mk.

---
 mk/compiler/ccache.mk  | 4 ++--
 mk/compiler/distcc.mk  | 4 ++--
 mk/compiler/mipspro.mk | 4 ++--
 mk/compiler/sunpro.mk  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'mk/compiler')

diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk
index 2ed8eefb9be..1b07936060b 100644
--- a/mk/compiler/ccache.mk
+++ b/mk/compiler/ccache.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.7 2004/02/05 03:35:20 jlam Exp $
+# $NetBSD: ccache.mk,v 1.8 2004/02/05 03:39:17 jlam Exp $
 
 .if !defined(COMPILER_CCACHE_MK)
 COMPILER_CCACHE_MK=	one
@@ -52,7 +52,7 @@ _CCACHE_LINKS+=	CXX
 # The following section is included only if we're not being included by
 # bsd.prefs.mk.
 #
-.if empty(BSD_PREFS_MK:M+*)
+.if empty(BSD_PREFS_MK)
 .  if empty(COMPILER_CCACHE_MK:Mtwo)
 COMPILER_CCACHE_MK+=	two
 
diff --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk
index 5d0524d9399..603b2932094 100644
--- a/mk/compiler/distcc.mk
+++ b/mk/compiler/distcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: distcc.mk,v 1.10 2004/02/05 03:35:20 jlam Exp $
+# $NetBSD: distcc.mk,v 1.11 2004/02/05 03:39:17 jlam Exp $
 
 .if !defined(COMPILER_DISTCC_MK)
 COMPILER_DISTCC_MK=	one
@@ -52,7 +52,7 @@ _DISTCC_LINKS+=	CXX
 # The following section is included only if we're not being included by
 # bsd.prefs.mk.
 #
-.if empty(BSD_PREFS_MK:M+*)
+.if empty(BSD_PREFS_MK)
 .  if empty(COMPILER_DISTCC_MK:Mtwo)
 COMPILER_DISTCC_MK+=	two
 
diff --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk
index ea7dbf90cb9..5b77e9f8b26 100644
--- a/mk/compiler/mipspro.mk
+++ b/mk/compiler/mipspro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mipspro.mk,v 1.9 2004/02/05 03:35:20 jlam Exp $
+# $NetBSD: mipspro.mk,v 1.10 2004/02/05 03:39:17 jlam Exp $
 
 .if !defined(COMPILER_MIPSPRO_MK)
 COMPILER_MIPSPRO_MK=	one
@@ -33,7 +33,7 @@ CC_VERSION=	mipspro
 # The following section is included only if we're not being included by
 # bsd.prefs.mk.
 #
-.if empty(BSD_PREFS_MK:M+*)
+.if empty(BSD_PREFS_MK)
 .  if empty(COMPILER_MIPSPRO_MK:Mtwo)
 COMPILER_MIPSPRO_MK+=	two
 
diff --git a/mk/compiler/sunpro.mk b/mk/compiler/sunpro.mk
index aa8a5bcadef..e624e908ded 100644
--- a/mk/compiler/sunpro.mk
+++ b/mk/compiler/sunpro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro.mk,v 1.7 2004/02/05 03:35:20 jlam Exp $
+# $NetBSD: sunpro.mk,v 1.8 2004/02/05 03:39:17 jlam Exp $
 
 .if !defined(COMPILER_SUNPRO_MK)
 COMPILER_SUNPRO_MK=	one
@@ -35,7 +35,7 @@ CC_VERSION=	sunpro
 # The following section is included only if we're not being included by
 # bsd.prefs.mk.
 #
-.if empty(BSD_PREFS_MK:M+*)
+.if empty(BSD_PREFS_MK)
 .  if empty(COMPILER_SUNPRO_MK:Mtwo)
 COMPILER_SUNPRO_MK+=	two
 
-- 
cgit v1.2.3