git: e018d97ce539 - main - bsdbox: use paths relative to SRCTOP instead of .CURDIR
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 21 Apr 2025 03:45:29 UTC
The branch main has been updated by kevans:
URL: https://cgit.FreeBSD.org/src/commit/?id=e018d97ce5394b05484686807b6de33aed6c3af5
commit e018d97ce5394b05484686807b6de33aed6c3af5
Author: Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2025-04-21 03:44:54 +0000
Commit: Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2025-04-21 03:45:02 +0000
bsdbox: use paths relative to SRCTOP instead of .CURDIR
This has been the going trend for years now, so switch to it.
Reviewed by: adrian, imp
Differential Revision: https://reviews.freebsd.org/D42502
---
tools/bsdbox/Makefile.hostapd | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/tools/bsdbox/Makefile.hostapd b/tools/bsdbox/Makefile.hostapd
index 6bce1c42b5ce..4459de171242 100644
--- a/tools/bsdbox/Makefile.hostapd
+++ b/tools/bsdbox/Makefile.hostapd
@@ -3,15 +3,18 @@
#
#
.include <src.opts.mk>
+
+WPASRC?= ${SRCTOP}/usr.sbin/wpa
+
CRUNCH_PROGS_usr.sbin+= hostapd hostapd_cli
-CRUNCH_SRCDIR_hostapd= $(.CURDIR)/../../usr.sbin/wpa/hostapd
-CRUNCH_SRCDIR_hostapd_cli= $(.CURDIR)/../../usr.sbin/wpa/hostapd_cli
+CRUNCH_SRCDIR_hostapd= ${WPASRC}/hostapd
+CRUNCH_SRCDIR_hostapd_cli= ${WPASRC}/hostapd_cli
CRUNCH_KEEP_hostapd+= wpa_driver_bsd_ops
CRUNCH_PROGS_usr.sbin+= wpa_supplicant wpa_cli
-CRUNCH_SRCDIR_wpa_supplicant= $(.CURDIR)/../../usr.sbin/wpa/wpa_supplicant
-CRUNCH_SRCDIR_wpa_cli= $(.CURDIR)/../../usr.sbin/wpa/wpa_cli
+CRUNCH_SRCDIR_wpa_supplicant= ${WPASRC}/wpa_supplicant
+CRUNCH_SRCDIR_wpa_cli= ${WPASRC}/wpa_cli
.if ${MK_OFED} != "no"
# libpcap dependencies if OFED is enabled