port-amd64/46820: Wrong include paths for modules.

[henning.petersen%t-online.de@localhost]

>Number:         46820
>Category:       port-amd64
>Synopsis:       Wrong include paths for modules.
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    port-amd64-maintainer
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Aug 20 11:55:00 +0000 2012
>Originator:     Henning Petersen
>Release:        NetBSD-current
>Organization:
>Environment:
>Description:
Wrong include paths for modules gpioiic, gpioow, gpiosim, onewire and pwdog.
>How-To-Repeat:

>Fix:
diff -u -p -r1.1 Makefile
--- sys/modules/gpioiic/Makefile        2 Oct 2011 11:43:30 -0000       1.1
+++ sys/modules/gpioiic/Makefile        20 Aug 2012 10:09:04 -0000
@@ -8,6 +8,6 @@ KMOD=           gpioiic
 IOCONF=                gpioiic.ioconf
 SRCS=          gpioiic.c
 
-CPPFLAGS+=     -I${S}/gpio
+CPPFLAGS+=     -I${S}/dev/gpio
 
 .include <bsd.kmodule.mk>
===================================================================
diff -u -p -r1.1 Makefile
--- sys/modules/gpioow/Makefile 31 Aug 2011 12:46:37 -0000      1.1
+++ sys/modules/gpioow/Makefile 20 Aug 2012 10:09:04 -0000
@@ -8,6 +8,6 @@ KMOD=           gpioow
 IOCONF=                gpioow.ioconf
 SRCS=          gpioow.c
 
-CPPFLAGS+=     -I${S}/gpio
+CPPFLAGS+=     -I${S}/dev/gpio
 
 .include <bsd.kmodule.mk>
===================================================================
diff -u -p -r1.1 Makefile
--- sys/modules/gpiosim/Makefile        12 Aug 2011 08:00:53 -0000      1.1
+++ sys/modules/gpiosim/Makefile        20 Aug 2012 10:09:04 -0000
@@ -7,6 +7,6 @@
 KMOD=          gpiosim
 SRCS=          gpiosim.c
 
-CPPFLAGS+=     -I${S}/gpio
+CPPFLAGS+=     -I${S}/dev/gpio
 
 .include <bsd.kmodule.mk>
===================================================================
diff -u -p -r1.1 Makefile
--- sys/modules/onewire/Makefile        31 Aug 2011 12:46:36 -0000      1.1
+++ sys/modules/onewire/Makefile        20 Aug 2012 10:09:04 -0000
@@ -8,6 +8,6 @@ KMOD=           onewire
 IOCONF=                onewire.ioconf
 SRCS=          onewire.c onewire_subr.c onewire_bitbang.c
 
-CPPFLAGS+=     -I${S}/onewire
+CPPFLAGS+=     -I${S}/dev/onewire
 
 .include <bsd.kmodule.mk>
===================================================================
diff -u -p -r1.1 Makefile
--- sys/modules/pwdog/Makefile  11 Aug 2011 07:33:25 -0000      1.1
+++ sys/modules/pwdog/Makefile  20 Aug 2012 10:09:04 -0000
@@ -8,7 +8,7 @@ KMOD=           pwdog
 IOCONF=                pwdog.ioconf
 SRCS=          pwdog.c
 
-CPPFLAGS+=     -I${S}/pci
+CPPFLAGS+=     -I${S}/dev/pci
 
 .include <bsd.kmodule.mk>