[pkgsrc/trunk]: pkgsrc/mk Simplify the logic that avoids using compat_headers...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2288238df751
branches:  trunk
changeset: 543762:2288238df751
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Jun 22 16:25:32 2008 +0000

description:
Simplify the logic that avoids using compat_headers during bootstrap.

diffstat:

 mk/bsd.prefs.mk |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (21 lines):

diff -r 725ece463a37 -r 2288238df751 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Sun Jun 22 16:24:28 2008 +0000
+++ b/mk/bsd.prefs.mk   Sun Jun 22 16:25:32 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.285 2008/06/16 15:10:48 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.286 2008/06/22 16:25:32 tnn Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -510,10 +510,7 @@
 .endif
 
 .if defined(FIX_SYSTEM_HEADERS) && ${FIX_SYSTEM_HEADERS} == "yes" && \
-    empty(PKGPATH:Mpkgtools/*) && empty(PKGPATH:M*/nbsed) && \
-    empty(PKGPATH:M*/nawk) && empty(PKGPATH:M*/bmake) && \
-    empty(PKGPATH:M*/install-sh) && empty(PKGPATH:M*/tnftp) && \
-    empty(PKGPATH:M*/pax) && \
+    !defined(BOOTSTRAP_PKG) && \
     exists(../../pkgtools/compat_headers/buildlink3.mk)
 .  include "../../pkgtools/compat_headers/buildlink3.mk"
 .endif