Author: ngie
Date: Thu Mar 2 05:04:45 2017
New Revision: 314541
URL: https://svnweb.freebsd.org/changeset/base/314541
Log:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output.
MFC after: 1 week
Sponsored by: Dell EMC Isilon
Modified:
head/usr.sbin/wpa/Makefile.inc
head/usr.sbin/wpa/hostapd/Makefile
head/usr.sbin/wpa/hostapd_cli/Makefile
head/usr.sbin/wpa/wpa_cli/Makefile
head/usr.sbin/wpa/wpa_passphrase/Makefile
head/usr.sbin/wpa/wpa_priv/Makefile
head/usr.sbin/wpa/wpa_supplicant/Makefile
Modified: head/usr.sbin/wpa/Makefile.inc
==============================================================================
--- head/usr.sbin/wpa/Makefile.inc Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/Makefile.inc Thu Mar 2 05:04:45 2017
(r314541)
@@ -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 \
Modified: head/usr.sbin/wpa/hostapd/Makefile
==============================================================================
--- head/usr.sbin/wpa/hostapd/Makefile Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/hostapd/Makefile Thu Mar 2 05:04:45 2017
(r314541)
@@ -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>
Modified: head/usr.sbin/wpa/hostapd_cli/Makefile
==============================================================================
--- head/usr.sbin/wpa/hostapd_cli/Makefile Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/hostapd_cli/Makefile Thu Mar 2 05:04:45 2017
(r314541)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
.PATH.c:${HOSTAPD_DISTDIR}
Modified: head/usr.sbin/wpa/wpa_cli/Makefile
==============================================================================
--- head/usr.sbin/wpa/wpa_cli/Makefile Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/wpa_cli/Makefile Thu Mar 2 05:04:45 2017
(r314541)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
.PATH.c:${WPA_SUPPLICANT_DISTDIR}
Modified: head/usr.sbin/wpa/wpa_passphrase/Makefile
==============================================================================
--- head/usr.sbin/wpa/wpa_passphrase/Makefile Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/wpa_passphrase/Makefile Thu Mar 2 05:04:45 2017
(r314541)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
.PATH.c:${WPA_SUPPLICANT_DISTDIR}
Modified: head/usr.sbin/wpa/wpa_priv/Makefile
==============================================================================
--- head/usr.sbin/wpa/wpa_priv/Makefile Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/wpa_priv/Makefile Thu Mar 2 05:04:45 2017
(r314541)
@@ -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
LIBADD= pcap
-.include "${.CURDIR}/../Makefile.crypto"
+.include "../Makefile.crypto"
.include <bsd.prog.mk>
Modified: head/usr.sbin/wpa/wpa_supplicant/Makefile
==============================================================================
--- head/usr.sbin/wpa/wpa_supplicant/Makefile Thu Mar 2 04:55:54 2017
(r314540)
+++ head/usr.sbin/wpa/wpa_supplicant/Makefile Thu Mar 2 05:04:45 2017
(r314541)
@@ -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>
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
