summaryrefslogtreecommitdiff
path: root/usr.sbin/bluetooth
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2017-03-04 11:38:03 +0000
committerEnji Cooper <ngie@FreeBSD.org>2017-03-04 11:38:03 +0000
commit64a0982bee3db2236df43357e70ce8dddbc21d48 (patch)
tree76664a67496ac3cd9e3d5d272a5a6e430068848a /usr.sbin/bluetooth
parentb71fb1a4aa198495970831c748fa2d132621fe3d (diff)
downloadsrc-test2-64a0982bee3db2236df43357e70ce8dddbc21d48.tar.gz
src-test2-64a0982bee3db2236df43357e70ce8dddbc21d48.zip
usr.sbin: normalize paths using SRCTOP-relative paths or :H when possible
This simplifies make logic/output MFC after: 1 month Sponsored by: Dell EMC Isilon
Notes
Notes: svn path=/head/; revision=314659
Diffstat (limited to 'usr.sbin/bluetooth')
-rw-r--r--usr.sbin/bluetooth/Makefile.inc3
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/Makefile4
-rw-r--r--usr.sbin/bluetooth/rfcomm_pppd/Makefile2
3 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/bluetooth/Makefile.inc b/usr.sbin/bluetooth/Makefile.inc
index c0e05cfa1da6..993a2f3616ab 100644
--- a/usr.sbin/bluetooth/Makefile.inc
+++ b/usr.sbin/bluetooth/Makefile.inc
@@ -1,4 +1,3 @@
# $FreeBSD$
-.include "${.CURDIR}/../../Makefile.inc"
-
+.include "${.CURDIR:H:H}/Makefile.inc"
diff --git a/usr.sbin/bluetooth/bthidcontrol/Makefile b/usr.sbin/bluetooth/bthidcontrol/Makefile
index 09128d6c0059..61988aed562e 100644
--- a/usr.sbin/bluetooth/bthidcontrol/Makefile
+++ b/usr.sbin/bluetooth/bthidcontrol/Makefile
@@ -1,13 +1,13 @@
# $Id: Makefile,v 1.2 2004/02/13 21:44:41 max Exp $
# $FreeBSD$
-.PATH: ${.CURDIR}/../bthidd
+.PATH: ${.CURDIR:H}/bthidd
PROG= bthidcontrol
MAN= bthidcontrol.8
SRCS= bthidcontrol.c hid.c lexer.l parser.y sdp.c
WARNS?= 1
-CFLAGS+= -DBTHIDCONTROL=1 -I${.CURDIR}/../bthidd
+CFLAGS+= -DBTHIDCONTROL=1 -I${.CURDIR:H}/bthidd
LIBADD+= bluetooth sdp usbhid
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/Makefile b/usr.sbin/bluetooth/rfcomm_pppd/Makefile
index f31e1e518480..c739fbf1174f 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/Makefile
+++ b/usr.sbin/bluetooth/rfcomm_pppd/Makefile
@@ -1,7 +1,7 @@
# $Id: Makefile,v 1.7 2003/09/07 18:32:11 max Exp $
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../usr.bin/bluetooth/rfcomm_sppd
+.PATH: ${SRCTOP}/usr.bin/bluetooth/rfcomm_sppd
PROG= rfcomm_pppd
MAN= rfcomm_pppd.8