summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/bsd.prefs.mk6
-rw-r--r--mk/compiler/ccache.mk4
-rw-r--r--mk/compiler/distcc.mk4
-rw-r--r--mk/compiler/mipspro.mk4
-rw-r--r--mk/compiler/sunpro.mk4
5 files changed, 11 insertions, 11 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 6fef0239571..9b941a2e53d 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.147 2004/02/05 03:37:47 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.148 2004/02/05 03:39:17 jlam Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -6,8 +6,8 @@
# to make sure any variables defined in /etc/mk.conf, $MAKECONF, or
# the system defaults (sys.mk and bsd.own.mk) are used.
-# If empty(BSD_PREFS_MK:M+*), then we are _not_ being included from
-# within bsd.prefs.mk.
+# If empty(BSD_PREFS_MK), then we are _not_ being included from within
+# bsd.prefs.mk.
#
BSD_PREFS_MK:= ${BSD_PREFS_MK}+
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