[src/trunk]: src/etc Make a simple fix for inculsion of disklabel.h. Since t...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bddaba81f185
branches:  trunk
changeset: 582048:bddaba81f185
user:      he <he%NetBSD.org@localhost>
date:      Tue Jun 14 20:47:46 2005 +0000

description:
Make a simple fix for inculsion of disklabel.h.  Since this script
doesn't do CPP conditionals, just avoid trying to "include" files
in the newly established nbinclude area, the in-tree version in the
normal place should work fine.

Fixes build problem for (among several others) cats.

diffstat:

 etc/MAKEDEV.awk |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 9925c1bb684c -r bddaba81f185 etc/MAKEDEV.awk
--- a/etc/MAKEDEV.awk   Tue Jun 14 18:29:58 2005 +0000
+++ b/etc/MAKEDEV.awk   Tue Jun 14 20:47:46 2005 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -
 #
-#      $NetBSD: MAKEDEV.awk,v 1.15 2004/04/22 23:02:39 enami Exp $
+#      $NetBSD: MAKEDEV.awk,v 1.16 2005/06/14 20:47:46 he Exp $
 #
 # Copyright (c) 2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -137,7 +137,10 @@
                                diskbackcompat = $3
                        else if ($1 == "#define" && $2 == "RAW_PART")
                                RAWDISK_OFF = $3
-                       else if ($1 == "#include" && $2 ~ "<.*/disklabel.h>") {
+                       else if ($1 == "#include" && 
+                                $2 ~ "<.*/disklabel.h>" &&
+                                $2 !~ ".*nbinclude.*")
+                       {
                                # wrapper, switch to the right file
                                incdir = substr($2, 2)
                                sub("/.*", "", incdir)
@@ -211,7 +214,7 @@
        print "# Generated from:"
 
        # MAKEDEV.awk (this script) RCS Id
-       ARCSID = "$NetBSD: MAKEDEV.awk,v 1.15 2004/04/22 23:02:39 enami Exp $"
+       ARCSID = "$NetBSD: MAKEDEV.awk,v 1.16 2005/06/14 20:47:46 he Exp $"
        gsub(/\$/, "", ARCSID)
        print "#        " ARCSID