d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

Browse Source 
This simplifies pathing in make/displayed output

MFC after:    3 weeks
Sponsored by: Dell EMC Isilon
This commit is contained in:
Enji Cooper 2017-01-20 04:52:29 +00:00
parent 85626903d5
commit 562cbd7bcd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libcrypt/Makefile
View File

@ -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