summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrent Cook <bcook@cvs.openbsd.org>2016-09-19 03:25:23 +0000
committerBrent Cook <bcook@cvs.openbsd.org>2016-09-19 03:25:23 +0000
commit6baeb374a4d5982a962bf603c1fd84a2d3481a4a (patch)
treeb20c6a8bc4324778cea07be5bee97633fa708b1e /lib
parentcedc05e3c6abb884beb4d6fc9b45b64d0677982a (diff)
Update ld search path for libssl/libcrypto, fixes cross-build after source moved.
from Patrick Wildt
Diffstat (limited to 'lib')
-rw-r--r--lib/libssl/Makefile6
-rw-r--r--lib/libtls/Makefile6
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libssl/Makefile b/lib/libssl/Makefile
index 4a5c140ed16..6421aabe34e 100644
--- a/lib/libssl/Makefile
+++ b/lib/libssl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2016/09/14 06:26:03 natano Exp $
+# $OpenBSD: Makefile,v 1.23 2016/09/19 03:25:22 bcook Exp $
SUBDIR= man
PC_FILES=openssl.pc libssl.pc
@@ -15,7 +15,7 @@ CFLAGS+= -Werror
CFLAGS+= -DLIBRESSL_INTERNAL
CFLAGS+= -I${.CURDIR}
-LDADD+= -L${BSDOBJDIR}/lib/libcrypto/crypto -lcrypto
+LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto
SRCS=\
s3_srvr.c s3_clnt.c s3_lib.c s3_pkt.c s3_both.c \
@@ -31,7 +31,7 @@ SRCS=\
SRCS+= s3_cbc.c
SRCS+= bs_ber.c bs_cbb.c bs_cbs.c
-HDRS= srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h
+HDRS= srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h
.PATH: ${.CURDIR}
diff --git a/lib/libtls/Makefile b/lib/libtls/Makefile
index 356c6f5b2ed..245b1def6eb 100644
--- a/lib/libtls/Makefile
+++ b/lib/libtls/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2016/09/04 12:26:43 bcook Exp $
+# $OpenBSD: Makefile,v 1.25 2016/09/19 03:25:22 bcook Exp $
CFLAGS+= -Wall -Werror -Wimplicit
CFLAGS+= -DLIBRESSL_INTERNAL
@@ -7,8 +7,8 @@ LIB= tls
DPADD= ${LIBCRYPTO} ${LIBSSL}
-LDADD+= -L${BSDOBJDIR}/lib/libcrypto/crypto -lcrypto
-LDADD+= -L${BSDOBJDIR}/lib/libssl/ssl -lssl
+LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto
+LDADD+= -L${BSDOBJDIR}/lib/libssl -lssl
HDRS= tls.h