From: deraadt <deraadt@openbsd.org>
Date: Fri, 18 Apr 2014 14:41:54 +0000 (+0000)
Subject: since e_os.h is dead, and e_os2.h is installed, we can fetch from there.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c7d7231e578aa2f1c7809c639369a571b4cd0557;p=openbsd

since e_os.h is dead, and e_os2.h is installed, we can fetch from there.
This means we don't need the reach-around anymore.
---

diff --git a/usr.sbin/openssl/Makefile b/usr.sbin/openssl/Makefile
index 2a2df8f2e6d..da72cbeeabc 100644
--- a/usr.sbin/openssl/Makefile
+++ b/usr.sbin/openssl/Makefile
@@ -1,18 +1,12 @@
-#	$OpenBSD: Makefile,v 1.25 2014/04/17 22:44:34 matthew Exp $
+#	$OpenBSD: Makefile,v 1.26 2014/04/18 14:41:54 deraadt Exp $
 
 PROG=	openssl
 LDADD=	-lssl -lcrypto
 MAN1=	openssl.1
 
-SSLEAYDIST= lib/libssl/src
-
-SSLEAY_SRC= ${.CURDIR}/../../${SSLEAYDIST}/apps
-SSLEAY_SRC_TOP= ${.CURDIR}/../../${SSLEAYDIST}
-
 CFLAGS+= -Wall
 CFLAGS+= -DTERMIOS -DANSI_SOURCE -DOPENSSL_NO_RC5
 CFLAGS+= -DOPENSSL_NO_SSL2
-CFLAGS+= -I${SSLEAY_SRC_TOP}
 
 SRCS=	verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c \
 	pkcs7.c crl2p7.c crl.c ca.c \
@@ -23,6 +17,6 @@ SRCS=	verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c \
 	spkac.c smime.c cms.c rand.c engine.c ocsp.c prime.c ts.c \
 	openssl.c s_cb.c dhparam.c
 
-.PATH:	${SSLEAY_SRC}
+.PATH:	${.CURDIR}/../../lib/libssl/src/apps
 
 .include <bsd.prog.mk>