From 20cce726e67abf9944cf38ec88e6dabde3500bd8 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 1 Aug 2017 05:39:40 +0000 Subject: [PATCH] Standardize paths on SRCTOP instead of .CURDIR-relative paths MFC after: 1 week --- sys/boot/geli/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/boot/geli/Makefile b/sys/boot/geli/Makefile index 2ab31d589e04..527d1c6a5464 100644 --- a/sys/boot/geli/Makefile +++ b/sys/boot/geli/Makefile @@ -28,16 +28,16 @@ SRCS+= bcmp.c bcopy.c bzero.c SRCS+= pwgets.c # sha256 and sha512 from sys/crypto -.PATH: ${.CURDIR}/../../crypto/sha2 +.PATH: ${SRCTOP}/sys/crypto/sha2 CFLAGS+= -DWEAK_REFS SRCS+= sha256c.c sha512c.c # md5 from libmd -.PATH: ${.CURDIR}/../../../lib/libmd +.PATH: ${SRCTOP}/lib/libmd SRCS+= md5c.c # AES implementation from sys/crypto -.PATH: ${.CURDIR}/../../crypto/rijndael +.PATH: ${SRCTOP}/sys/crypto/rijndael CFLAGS+= -I${.CURDIR}/../../ CFLAGS+= -I${.CURDIR}/../common/ # Remove asserts @@ -45,7 +45,7 @@ CFLAGS+= -DNDEBUG SRCS+= rijndael-alg-fst.c rijndael-api-fst.c rijndael-api.c # local GELI Implementation -.PATH: ${.CURDIR}/../../geom/eli +.PATH: ${SRCTOP}/sys/geom/eli CFLAGS+= -D_STAND SRCS+= geliboot_crypto.c g_eli_hmac.c g_eli_key.c g_eli_key_cache.c pkcs5v2.c