svn commit: r314658 - in head/secure: . lib lib/libcrypto lib/libcrypto/engines lib/libssh

[Ngie Cooper]

Author: ngie
Date: Sat Mar  4 11:35:30 2017
New Revision: 314658
URL: https://svnweb.freebsd.org/changeset/base/314658

Log:
  crypto: normalize paths using SRCTOP-relative paths or :H when possible
  
  This simplifies make logic/output
  
  MFC after:	1 month
  Sponsored by:	Dell EMC Isilon

Modified:
  head/secure/Makefile
  head/secure/Makefile.inc
  head/secure/lib/Makefile.inc
  head/secure/lib/libcrypto/Makefile.inc
  head/secure/lib/libcrypto/engines/Makefile.inc
  head/secure/lib/libssh/Makefile

Modified: head/secure/Makefile
==============================================================================
--- head/secure/Makefile	Sat Mar  4 11:34:36 2017	(r314657)
+++ head/secure/Makefile	Sat Mar  4 11:35:30 2017	(r314658)
@@ -21,7 +21,7 @@ SPROGS+=usr.sbin/sendmail
 # This target is used to rebuild these programs with crypto.
 secure: .MAKE .PHONY
 .for entry in ${SPROGS}
-	cd ${.CURDIR}/../${entry}; \
+	cd ${.CURDIR:H}/${entry}; \
 	${MAKE} cleandir; \
 	${MAKE} obj; \
 	${MAKE} all; \
@@ -31,7 +31,7 @@ secure: .MAKE .PHONY
 # This target is used to rebuild these programs without crypto.
 insecure: .MAKE .PHONY
 .for entry in ${SPROGS}
-	cd ${.CURDIR}/../${entry}; \
+	cd ${.CURDIR:H}/${entry}; \
 	${MAKE} MK_CRYPT=no cleandir; \
 	${MAKE} MK_CRYPT=no obj; \
 	${MAKE} MK_CRYPT=no all; \

Modified: head/secure/Makefile.inc
==============================================================================
--- head/secure/Makefile.inc	Sat Mar  4 11:34:36 2017	(r314657)
+++ head/secure/Makefile.inc	Sat Mar  4 11:35:30 2017	(r314658)
@@ -2,14 +2,14 @@
 
 .include <src.opts.mk>
 
-.if exists(${.CURDIR}/../../lib/libcrypt/obj)
-CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt/obj
+.if exists(${.CURDIR:H:H}/lib/libcrypt/obj)
+CRYPTOBJDIR=	${.CURDIR:H:H}/lib/libcrypt/obj
 .else
-CRYPTOBJDIR=	${.CURDIR}/../../lib/libcrypt
+CRYPTOBJDIR=	${.CURDIR:H:H}/lib/libcrypt
 .endif
 
 .if ${MK_OPENSSH} != "no"
-SSHDIR=		${.CURDIR}/../../../crypto/openssh
+SSHDIR=		${SRCTOP}/crypto/openssh
 .endif
 
 WARNS?=		0

Modified: head/secure/lib/Makefile.inc
==============================================================================
--- head/secure/lib/Makefile.inc	Sat Mar  4 11:34:36 2017	(r314657)
+++ head/secure/lib/Makefile.inc	Sat Mar  4 11:35:30 2017	(r314658)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
-.if exists(${.CURDIR}/../../../lib/Makefile.inc)
-.include "${.CURDIR}/../../../lib/Makefile.inc"
+.if exists(${.CURDIR:H:H:H}/lib/Makefile.inc)
+.include "${.CURDIR:H:H:H}/lib/Makefile.inc"
 .endif

Modified: head/secure/lib/libcrypto/Makefile.inc
==============================================================================
--- head/secure/lib/libcrypto/Makefile.inc	Sat Mar  4 11:34:36 2017	(r314657)
+++ head/secure/lib/libcrypto/Makefile.inc	Sat Mar  4 11:35:30 2017	(r314658)
@@ -6,7 +6,7 @@
 OPENSSL_VER=	1.0.2k
 OPENSSL_DATE=	2017-01-26
 
-LCRYPTO_SRC=	${.CURDIR}/../../../crypto/openssl
+LCRYPTO_SRC=	${SRCTOP}/crypto/openssl
 LCRYPTO_DOC=	${LCRYPTO_SRC}/doc
 
 CFLAGS+=	-I${LCRYPTO_SRC}

Modified: head/secure/lib/libcrypto/engines/Makefile.inc
==============================================================================
--- head/secure/lib/libcrypto/engines/Makefile.inc	Sat Mar  4 11:34:36 2017	(r314657)
+++ head/secure/lib/libcrypto/engines/Makefile.inc	Sat Mar  4 11:35:30 2017	(r314658)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LCRYPTO_SRC=	${.CURDIR}/../../../../../crypto/openssl
+LCRYPTO_SRC=	${SRCTOP}/crypto/openssl
 .PATH: ${LCRYPTO_SRC}/engines ${LCRYPTO_SRC}/engines/ccgost
 
 SHLIBDIR?= /usr/lib/engines

Modified: head/secure/lib/libssh/Makefile
==============================================================================
--- head/secure/lib/libssh/Makefile	Sat Mar  4 11:34:36 2017	(r314657)
+++ head/secure/lib/libssh/Makefile	Sat Mar  4 11:35:30 2017	(r314658)
@@ -37,7 +37,7 @@ SRCS+=	bcrypt_pbkdf.c blowfish.c bsd-mis
 .if ${MK_LDNS} == "no"
 SRCS+=	getrrsetbyname.c
 .else
-LDNSDIR=	${.CURDIR}/../../../contrib/ldns
+LDNSDIR=	${SRCTOP}/contrib/ldns
 CFLAGS+=	-DHAVE_LDNS=1 -I${LDNSDIR}
 SRCS+=	getrrsetbyname-ldns.c
 LIBADD+=	ldns