git: d1f34a51793f - stable/12 - WPA_DISTDIR does not need to end in a slash

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Tue, 19 Jul 2022 18:02:58 UTC

The branch stable/12 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=d1f34a51793f30aef5307f82489b5117ec85ca50

commit d1f34a51793f30aef5307f82489b5117ec85ca50
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2022-07-16 15:45:26 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2022-07-19 18:01:38 +0000

    WPA_DISTDIR does not need to end in a slash
    
    Since all uses of the macro also append a slash, this leads to double
    slashes.
    
    MFC after:      3 days
    
    (cherry picked from commit 9917049b60f7cf7345a09d2bc22d51764a477984)
---
 usr.sbin/wpa/Makefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc
index 88de7fc67456..f304baecc2a4 100644
--- a/usr.sbin/wpa/Makefile.inc
+++ b/usr.sbin/wpa/Makefile.inc
@@ -4,7 +4,7 @@
 
 BINDIR?=	/usr/sbin
 
-WPA_DISTDIR?= 		${SRCTOP}/contrib/wpa/
+WPA_DISTDIR?= 		${SRCTOP}/contrib/wpa
 WPA_SUPPLICANT_DISTDIR?=${WPA_DISTDIR}/wpa_supplicant
 HOSTAPD_DISTDIR?=	${WPA_DISTDIR}/hostapd