diff options
author | ngie <ngie@FreeBSD.org> | 2017-05-30 04:45:11 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2017-05-30 04:45:11 +0000 |
commit | f89a2cd081a50b3469af54e920db5b1ad7ef02ba (patch) | |
tree | e9d1d773cedb7a36d4682c8be15b561960f62eb8 /usr.sbin/wpa | |
parent | efdb1c86f413aa51a4e483c60ec042d376c6f6b2 (diff) | |
download | FreeBSD-src-f89a2cd081a50b3469af54e920db5b1ad7ef02ba.zip FreeBSD-src-f89a2cd081a50b3469af54e920db5b1ad7ef02ba.tar.gz |
MFC r314541:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones
This simplifies pathing in make/displayed output.
Diffstat (limited to 'usr.sbin/wpa')
-rw-r--r-- | usr.sbin/wpa/Makefile.inc | 4 | ||||
-rw-r--r-- | usr.sbin/wpa/hostapd/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/wpa/hostapd_cli/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/wpa/wpa_cli/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/wpa/wpa_passphrase/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/wpa/wpa_priv/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/wpa/wpa_supplicant/Makefile | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc index 0b13b97..2029fd6 100644 --- a/usr.sbin/wpa/Makefile.inc +++ b/usr.sbin/wpa/Makefile.inc @@ -2,11 +2,11 @@ BINDIR?= /usr/sbin -WPA_DISTDIR?= ${.CURDIR}/../../../contrib/wpa/ +WPA_DISTDIR?= ${SRCTOP}/contrib/wpa/ WPA_SUPPLICANT_DISTDIR?=${WPA_DISTDIR}/wpa_supplicant HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd -.PATH.c:${.CURDIR}/.. \ +.PATH.c:${.CURDIR:H} \ ${WPA_DISTDIR}/src/ap \ ${WPA_DISTDIR}/src/common \ ${WPA_DISTDIR}/src/crypto \ diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile index 4437839..b2feb94 100644 --- a/usr.sbin/wpa/hostapd/Makefile +++ b/usr.sbin/wpa/hostapd/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ .include <src.opts.mk> -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${HOSTAPD_DISTDIR} \ ${WPA_DISTDIR}/src/drivers @@ -117,6 +117,6 @@ SRCS+= eap_server_sake.c \ eap_sake_common.c .endif -.include "${.CURDIR}/../Makefile.crypto" +.include "../Makefile.crypto" .include <bsd.prog.mk> diff --git a/usr.sbin/wpa/hostapd_cli/Makefile b/usr.sbin/wpa/hostapd_cli/Makefile index 48af140..a9c4393 100644 --- a/usr.sbin/wpa/hostapd_cli/Makefile +++ b/usr.sbin/wpa/hostapd_cli/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${HOSTAPD_DISTDIR} diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile index 3203829..585499d 100644 --- a/usr.sbin/wpa/wpa_cli/Makefile +++ b/usr.sbin/wpa/wpa_cli/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile b/usr.sbin/wpa/wpa_passphrase/Makefile index aaf5c19..c42ea4a 100644 --- a/usr.sbin/wpa/wpa_passphrase/Makefile +++ b/usr.sbin/wpa/wpa_passphrase/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} diff --git a/usr.sbin/wpa/wpa_priv/Makefile b/usr.sbin/wpa/wpa_priv/Makefile index cf77678..fc897df 100644 --- a/usr.sbin/wpa/wpa_priv/Makefile +++ b/usr.sbin/wpa/wpa_priv/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ ${WPA_DISTDIR}/src/drivers @@ -11,6 +11,6 @@ SRCS= drivers.c os_unix.c eloop.c common.c wpa_debug.c wpabuf.c wpa_priv.c \ LIBADD= pcap -.include "${.CURDIR}/../Makefile.crypto" +.include "../Makefile.crypto" .include <bsd.prog.mk> diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile index 65b0c77..a8ccb16 100644 --- a/usr.sbin/wpa/wpa_supplicant/Makefile +++ b/usr.sbin/wpa/wpa_supplicant/Makefile @@ -2,7 +2,7 @@ .include <src.opts.mk> -.include "${.CURDIR}/../Makefile.inc" +.include "../Makefile.inc" .PATH.c:${WPA_SUPPLICANT_DISTDIR} \ ${WPA_DISTDIR}/src/drivers @@ -142,6 +142,6 @@ SRCS+= eap_sake.c \ eap_sake_common.c .endif -.include "${.CURDIR}/../Makefile.crypto" +.include "../Makefile.crypto" .include <bsd.prog.mk> |