[pkgsrc/trunk]: pkgsrc/mk Simpilfy the test for whether we're inside bsd.pref...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/79aaa8f95ce9
branches:  trunk
changeset: 467680:79aaa8f95ce9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Feb 05 03:39:17 2004 +0000

description:
Simpilfy the test for whether we're inside bsd.prefs.mk.

diffstat:

 mk/bsd.prefs.mk        |  6 +++---
 mk/compiler/ccache.mk  |  4 ++--
 mk/compiler/distcc.mk  |  4 ++--
 mk/compiler/mipspro.mk |  4 ++--
 mk/compiler/sunpro.mk  |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diffs (92 lines):

diff -r 938b47a9a267 -r 79aaa8f95ce9 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Thu Feb 05 03:37:47 2004 +0000
+++ b/mk/bsd.prefs.mk   Thu Feb 05 03:39:17 2004 +0000
@@ -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 -r 938b47a9a267 -r 79aaa8f95ce9 mk/compiler/ccache.mk
--- a/mk/compiler/ccache.mk     Thu Feb 05 03:37:47 2004 +0000
+++ b/mk/compiler/ccache.mk     Thu Feb 05 03:39:17 2004 +0000
@@ -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 @@
 # 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 -r 938b47a9a267 -r 79aaa8f95ce9 mk/compiler/distcc.mk
--- a/mk/compiler/distcc.mk     Thu Feb 05 03:37:47 2004 +0000
+++ b/mk/compiler/distcc.mk     Thu Feb 05 03:39:17 2004 +0000
@@ -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 @@
 # 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 -r 938b47a9a267 -r 79aaa8f95ce9 mk/compiler/mipspro.mk
--- a/mk/compiler/mipspro.mk    Thu Feb 05 03:37:47 2004 +0000
+++ b/mk/compiler/mipspro.mk    Thu Feb 05 03:39:17 2004 +0000
@@ -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 @@
 # 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 -r 938b47a9a267 -r 79aaa8f95ce9 mk/compiler/sunpro.mk
--- a/mk/compiler/sunpro.mk     Thu Feb 05 03:37:47 2004 +0000
+++ b/mk/compiler/sunpro.mk     Thu Feb 05 03:39:17 2004 +0000
@@ -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 @@
 # 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