svn commit: r312503 - head/lib/libcrypt

Ngie Cooper ngie at FreeBSD.org
Fri Jan 20 04:52:31 UTC 2017


Author: ngie
Date: Fri Jan 20 04:52:29 2017
New Revision: 312503
URL: https://svnweb.freebsd.org/changeset/base/312503

Log:
  Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones
  
  This simplifies pathing in make/displayed output
  
  MFC after:    3 weeks
  Sponsored by: Dell EMC Isilon

Modified:
  head/lib/libcrypt/Makefile

Modified: head/lib/libcrypt/Makefile
==============================================================================
--- head/lib/libcrypt/Makefile	Fri Jan 20 04:52:00 2017	(r312502)
+++ head/lib/libcrypt/Makefile	Fri Jan 20 04:52:29 2017	(r312503)
@@ -10,7 +10,7 @@ SHLIBDIR?=	/lib
 SHLIB_MAJOR=	5
 LIB=		crypt
 
-.PATH:		${.CURDIR}/../libmd ${.CURDIR}/../../sys/crypto/sha2
+.PATH:		${SRCTOP}/lib/libmd ${SRCTOP}/sys/crypto/sha2
 SRCS=		crypt.c misc.c \
 		crypt-md5.c md5c.c \
 		crypt-nthash.c md4c.c \
@@ -19,12 +19,12 @@ SRCS=		crypt.c misc.c \
 MAN=		crypt.3
 MLINKS=		crypt.3 crypt_get_format.3 crypt.3 crypt_r.3 \
 		crypt.3 crypt_set_format.3
-CFLAGS+=	-I${.CURDIR}/../libmd -I${.CURDIR}/../libutil \
-		-I${.CURDIR}/../../sys/crypto/sha2
+CFLAGS+=	-I${SRCTOP}/lib/libmd -I${SRCTOP}/lib/libutil \
+		-I${SRCTOP}/sys/crypto/sha2
 
 # Pull in the strong crypto, if it is present.
-.if exists(${.CURDIR}/../../secure/lib/libcrypt) && ${MK_CRYPT} != "no"
-.PATH:		${.CURDIR}/../../secure/lib/libcrypt
+.if exists(${SRCTOP}/secure/lib/libcrypt) && ${MK_CRYPT} != "no"
+.PATH:		${SRCTOP}/secure/lib/libcrypt
 SRCS+=		crypt-des.c crypt-blowfish.c blowfish.c
 CFLAGS+=	-I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
 .endif


More information about the svn-src-all mailing list