7 files changed, 33 insertions, 42 deletions

diff --git a/sys/modules/ugen/Makefile b/sys/modules/ugen/Makefile
index b66c96f7928f..0d203880a060 100644
--- a/sys/modules/ugen/Makefile
+++ b/sys/modules/ugen/Makefile
@@ -1,13 +1,12 @@
 #       $FreeBSD$ 
 
 MAINTAINER	 = n_hibma@freebsd.org
-SOURCE		 = ${.CURDIR}/../../dev/usb
+S		 = ${.CURDIR}/../..
 
-.PATH:  ${SOURCE}
+.PATH:  	 $S/dev/usb
 KMOD		 = ugen
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h ugen.c
 NOMAN		 =
-CFLAGS		+= -g
 CLEANFILES	+= bus_if.h device_if.h vnode_if.h opt_usb.h \
 		   vnode_if.c
 
@@ -15,8 +14,8 @@ opt_usb.h:
 	echo > opt_usb.h
 
 bus_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/bus_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/bus_if.m
 device_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/device_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/device_if.m
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/uhid/Makefile b/sys/modules/uhid/Makefile
index 4158de448e05..572d93d55879 100644
--- a/sys/modules/uhid/Makefile
+++ b/sys/modules/uhid/Makefile
@@ -1,13 +1,12 @@
 #       $FreeBSD$ 
 
 MAINTAINER	 = n_hibma@freebsd.org
-SOURCE		 = ${.CURDIR}/../../dev/usb
+S		 = ${.CURDIR}/../..
 
-.PATH:  ${SOURCE}
+.PATH:  	 $S/dev/usb
 KMOD		 = uhid
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h uhid.c
 NOMAN		 =
-CFLAGS		+= -g
 CLEANFILES	+= bus_if.h device_if.h vnode_if.h opt_usb.h \
 		   vnode_if.c
 
@@ -15,8 +14,8 @@ opt_usb.h:
 	echo > opt_usb.h
 
 bus_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/bus_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/bus_if.m
 device_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/device_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/device_if.m
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ukbd/Makefile b/sys/modules/ukbd/Makefile
index dd6cc7f487fd..fb07ab5e09d6 100644
--- a/sys/modules/ukbd/Makefile
+++ b/sys/modules/ukbd/Makefile
@@ -1,29 +1,29 @@
 #       $FreeBSD$ 
 
 MAINTAINER	 = n_hibma@freebsd.org
-SOURCE		 = ${.CURDIR}/../../dev/usb
+S		 = ${.CURDIR}/../..
 
-.PATH:  ${SOURCE}
+.PATH:  	 $S/dev/usb
 KMOD		 = ukbd
 SRCS		 = bus_if.h device_if.h vnode_if.h \
 		   opt_usb.h ukbd.h opt_kbd.h \
 		   ukbd.c
 NOMAN		 =
-CFLAGS		+= -g
 CLEANFILES	+= bus_if.h device_if.h vnode_if.h \
 		   opt_usb.h ukbd.h opt_kbd.h \
 		   vnode_if.c
 
 opt_usb.h:
 	echo > opt_usb.h
+
 ukbd.h:
 	echo > ukbd.h
+
 opt_kbd.h:
 	echo '#define KBD_INSTALL_CDEV 1' > opt_kbd.h
-
 bus_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/bus_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/bus_if.m
 device_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/device_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/device_if.m
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile
index 76fa4bb10a28..5f2a88fed606 100644
--- a/sys/modules/ulpt/Makefile
+++ b/sys/modules/ulpt/Makefile
@@ -1,13 +1,12 @@
 #       $FreeBSD$ 
 
 MAINTAINER	 = n_hibma@freebsd.org
-SOURCE		 = ${.CURDIR}/../../dev/usb
+S		 = ${.CURDIR}/../..
 
-.PATH:  ${SOURCE}
+.PATH:  	 $S/dev/usb
 KMOD		 = ulpt
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h ulpt.c
 NOMAN		 =
-CFLAGS		+= -g
 CLEANFILES	+= bus_if.h device_if.h vnode_if.h opt_usb.h \
 		   vnode_if.c
 
@@ -15,8 +14,8 @@ opt_usb.h:
 	echo >opt_usb.h
 
 bus_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/bus_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/bus_if.m
 device_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/device_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/device_if.m
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/umass/Makefile b/sys/modules/umass/Makefile
index c73a798f5405..5679cddbe334 100644
--- a/sys/modules/umass/Makefile
+++ b/sys/modules/umass/Makefile
@@ -1,31 +1,27 @@
 #       $FreeBSD$ 
 
 MAINTAINER	 = n_hibma@freebsd.org
-SOURCE		 = ${.CURDIR}/../../dev/usb
+S		 = ${.CURDIR}/../..
 
-.PATH:  ${SOURCE}
+.PATH:  	 $S/dev/usb
 KMOD		 = umass
-SRCS		 = bus_if.h device_if.h vnode_if.h \
+SRCS		 = bus_if.h device_if.h \
 		   opt_usb.h opt_cam.h opt_scsi.h \
 		   umass.c
 NOMAN		 =
-#CFLAGS		+= -g
-CFLAGS		= -g
-CLEANFILES	+= bus_if.h device_if.h vnode_if.h \
-		   opt_usb.h opt_cam.h opt_scsi.h \
-		   vnode_if.c
+CLEANFILES	+= bus_if.h device_if.h \
+		   opt_usb.h opt_cam.h opt_scsi.h
 
 opt_usb.h:
 	echo > opt_usb.h
-#	echo '#define UMASS_DEBUG 1' >> opt_usb.h
 opt_scsi.h:
 	echo '#define SCSI_DELAY 15000' > opt_scsi.h
 opt_cam.h:
 	echo > opt_cam.h
 
 bus_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/bus_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/bus_if.m
 device_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/device_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/device_if.m
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/umodem/Makefile b/sys/modules/umodem/Makefile
index 21388c05a00d..073072b781a2 100644
--- a/sys/modules/umodem/Makefile
+++ b/sys/modules/umodem/Makefile
@@ -1,13 +1,12 @@
 #       $FreeBSD$ 
 
 MAINTAINER	 = n_hibma@freebsd.org
-SOURCE		 = ${.CURDIR}/../../dev/usb
+S		 = ${.CURDIR}/../..
 
-.PATH:  ${SOURCE}
+.PATH:  	 $S/dev/usb
 KMOD		 = umodem
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h umodem.c
 NOMAN		 =
-CFLAGS		+= -g
 CLEANFILES	+= bus_if.h device_if.h vnode_if.h opt_usb.h \
 		   vnode_if.c
 
@@ -15,8 +14,8 @@ opt_usb.h:
 	echo > opt_usb.h
 
 bus_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/bus_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/bus_if.m
 device_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/device_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/device_if.m
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ums/Makefile b/sys/modules/ums/Makefile
index 0f68eebfe221..b153f5bf86c3 100644
--- a/sys/modules/ums/Makefile
+++ b/sys/modules/ums/Makefile
@@ -1,13 +1,12 @@
 #       $FreeBSD$ 
 
 MAINTAINER	 = n_hibma@freebsd.org
-SOURCE		 = ${.CURDIR}/../../dev/usb
+S		 = ${.CURDIR}/../..
 
-.PATH:  ${SOURCE}
+.PATH:  	 $S/dev/usb
 KMOD		 = ums
 SRCS		 = bus_if.h device_if.h vnode_if.h opt_usb.h ums.c
 NOMAN		 =
-CFLAGS		+= -g
 CLEANFILES	+= bus_if.h device_if.h vnode_if.h opt_usb.h \
 		   vnode_if.c
 
@@ -15,8 +14,8 @@ opt_usb.h:
 	echo > opt_usb.h
 
 bus_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/bus_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/bus_if.m
 device_if.h:
-	perl ${KERN}/makedevops.pl -h ${KERN}/device_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/device_if.m
 
 .include <bsd.kmod.mk>