svn commit: r319190 - in stable/11/usr.sbin/wpa: . hostapd hostapd_cli wpa_cli wpa_passphrase wpa_priv wpa_supplicant

[Ngie Cooper]

Author: ngie
Date: Tue May 30 04:45:11 2017
New Revision: 319190
URL: https://svnweb.freebsd.org/changeset/base/319190

Log:
  MFC r314541:
  
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones
  
  This simplifies pathing in make/displayed output.

Modified:
  stable/11/usr.sbin/wpa/Makefile.inc
  stable/11/usr.sbin/wpa/hostapd/Makefile
  stable/11/usr.sbin/wpa/hostapd_cli/Makefile
  stable/11/usr.sbin/wpa/wpa_cli/Makefile
  stable/11/usr.sbin/wpa/wpa_passphrase/Makefile
  stable/11/usr.sbin/wpa/wpa_priv/Makefile
  stable/11/usr.sbin/wpa/wpa_supplicant/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/wpa/Makefile.inc
==============================================================================
--- stable/11/usr.sbin/wpa/Makefile.inc	Tue May 30 04:42:36 2017	(r319189)
+++ stable/11/usr.sbin/wpa/Makefile.inc	Tue May 30 04:45:11 2017	(r319190)
@@ -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: stable/11/usr.sbin/wpa/hostapd/Makefile
==============================================================================
--- stable/11/usr.sbin/wpa/hostapd/Makefile	Tue May 30 04:42:36 2017	(r319189)
+++ stable/11/usr.sbin/wpa/hostapd/Makefile	Tue May 30 04:45:11 2017	(r319190)
@@ -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: stable/11/usr.sbin/wpa/hostapd_cli/Makefile
==============================================================================
--- stable/11/usr.sbin/wpa/hostapd_cli/Makefile	Tue May 30 04:42:36 2017	(r319189)
+++ stable/11/usr.sbin/wpa/hostapd_cli/Makefile	Tue May 30 04:45:11 2017	(r319190)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
 
 .PATH.c:${HOSTAPD_DISTDIR}
 

Modified: stable/11/usr.sbin/wpa/wpa_cli/Makefile
==============================================================================
--- stable/11/usr.sbin/wpa/wpa_cli/Makefile	Tue May 30 04:42:36 2017	(r319189)
+++ stable/11/usr.sbin/wpa/wpa_cli/Makefile	Tue May 30 04:45:11 2017	(r319190)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
 
 .PATH.c:${WPA_SUPPLICANT_DISTDIR}
 

Modified: stable/11/usr.sbin/wpa/wpa_passphrase/Makefile
==============================================================================
--- stable/11/usr.sbin/wpa/wpa_passphrase/Makefile	Tue May 30 04:42:36 2017	(r319189)
+++ stable/11/usr.sbin/wpa/wpa_passphrase/Makefile	Tue May 30 04:45:11 2017	(r319190)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
 
 .PATH.c:${WPA_SUPPLICANT_DISTDIR}
 

Modified: stable/11/usr.sbin/wpa/wpa_priv/Makefile
==============================================================================
--- stable/11/usr.sbin/wpa/wpa_priv/Makefile	Tue May 30 04:42:36 2017	(r319189)
+++ stable/11/usr.sbin/wpa/wpa_priv/Makefile	Tue May 30 04:45:11 2017	(r319190)
@@ -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
 
 LIBADD=	pcap
 
-.include "${.CURDIR}/../Makefile.crypto"
+.include "../Makefile.crypto"
 
 .include <bsd.prog.mk>

Modified: stable/11/usr.sbin/wpa/wpa_supplicant/Makefile
==============================================================================
--- stable/11/usr.sbin/wpa/wpa_supplicant/Makefile	Tue May 30 04:42:36 2017	(r319189)
+++ stable/11/usr.sbin/wpa/wpa_supplicant/Makefile	Tue May 30 04:45:11 2017	(r319190)
@@ -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>