Refer to the kernel headers consistently via ../../sys, even for mkioctl

and mksubr

ok otto@

1 files changed, 37 insertions, 35 deletions

diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index e308c79fd97..0a20bee1c39 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -1,48 +1,50 @@
-#	$OpenBSD: Makefile,v 1.25 2013/11/22 07:50:36 mpi Exp $
+#	$OpenBSD: Makefile,v 1.26 2013/12/21 07:30:00 guenther Exp $
 
 LDSTATIC=${STATIC}
 PROG=	kdump
-CFLAGS+=-I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../../sys
+SYS_DIR=${.CURDIR}/../../sys
+CFLAGS+=-I${.CURDIR}/../ktrace -I${.CURDIR} -I${SYS_DIR}
 SRCS=	kdump.c ioctl.c kdump_subr.c subr.c ktrstruct.c
 .PATH:	${.CURDIR}/../ktrace
 CLEANFILES+=ioctl.c kdump_subr.c
 
 ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls
 	CC="${CC}" \
-	/bin/sh ${.CURDIR}/mkioctls /usr/include/sys/ioctl.h \
-	    /usr/include/sys/ioctl_compat.h \
-	    /usr/include/crypto/cryptodev.h \
-	    /usr/include/dev/biovar.h \
-	    /usr/include/dev/systrace.h \
-	    /usr/include/dev/wscons/wsconsio.h \
-	    /usr/include/dev/vndioctl.h \
-	    /usr/include/dev/pci/drm/drm.h \
-	    /usr/include/dev/usb/usb.h \
-	    /usr/include/net/bpf.h \
-	    /usr/include/net/if_ppp.h \
-	    /usr/include/net/if_pppoe.h \
-	    /usr/include/net/if_tun.h \
-	    /usr/include/net/pfvar.h \
-	    /usr/include/net80211/ieee80211_ioctl.h \
-	    /usr/include/netinet6/in6_var.h \
-	    /usr/include/sys/tty.h \
-	    /usr/include/sys/agpio.h \
-	    /usr/include/sys/ataio.h \
-	    /usr/include/sys/audioio.h \
-	    /usr/include/sys/cdio.h \
-	    /usr/include/sys/chio.h \
-	    /usr/include/sys/dkio.h \
-	    /usr/include/sys/filio.h \
-	    /usr/include/sys/gpio.h \
-	    /usr/include/sys/mtio.h \
-	    /usr/include/sys/pciio.h \
-	    /usr/include/sys/radioio.h \
-	    /usr/include/sys/scanio.h \
-	    /usr/include/sys/scsiio.h \
-	    /usr/include/sys/sockio.h \
-	    /usr/include/sys/videoio.h > ioctl.c
+	/bin/sh ${.CURDIR}/mkioctls ${SYS_DIR}/sys/ioctl.h \
+	    ${SYS_DIR}/sys/ioctl_compat.h \
+	    ${SYS_DIR}/crypto/cryptodev.h \
+	    ${SYS_DIR}/dev/biovar.h \
+	    ${SYS_DIR}/dev/systrace.h \
+	    ${SYS_DIR}/dev/wscons/wsconsio.h \
+	    ${SYS_DIR}/dev/vndioctl.h \
+	    ${SYS_DIR}/dev/pci/drm/drm.h \
+	    ${SYS_DIR}/dev/usb/usb.h \
+	    ${SYS_DIR}/net/bpf.h \
+	    ${SYS_DIR}/net/if_ppp.h \
+	    ${SYS_DIR}/net/if_pppoe.h \
+	    ${SYS_DIR}/net/if_tun.h \
+	    ${SYS_DIR}/net/pfvar.h \
+	    ${SYS_DIR}/net80211/ieee80211_ioctl.h \
+	    ${SYS_DIR}/netinet6/in6_var.h \
+	    ${SYS_DIR}/sys/tty.h \
+	    ${SYS_DIR}/sys/agpio.h \
+	    ${SYS_DIR}/sys/ataio.h \
+	    ${SYS_DIR}/sys/audioio.h \
+	    ${SYS_DIR}/sys/cdio.h \
+	    ${SYS_DIR}/sys/chio.h \
+	    ${SYS_DIR}/sys/dkio.h \
+	    ${SYS_DIR}/sys/filio.h \
+	    ${SYS_DIR}/sys/gpio.h \
+	    ${SYS_DIR}/sys/mtio.h \
+	    ${SYS_DIR}/sys/pciio.h \
+	    ${SYS_DIR}/sys/radioio.h \
+	    ${SYS_DIR}/sys/scanio.h \
+	    ${SYS_DIR}/sys/scsiio.h \
+	    ${SYS_DIR}/sys/sockio.h \
+	    ${SYS_DIR}/sys/videoio.h \
+		> ioctl.c
 
 kdump_subr.c: ${.CURDIR}/mksubr
-	sh ${.CURDIR}/mksubr /usr/include > ${.TARGET}
+	sh ${.CURDIR}/mksubr ${SYS_DIR} > ${.TARGET}
 
 .include <bsd.prog.mk>