Fix makefile problems - Don't use SSLeay style include link farm to

build - get includes from where they really live.

1 files changed, 34 insertions, 3 deletions

diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile
index a2fce87b5cb..facbfa9ca7a 100644
--- a/lib/libssl/ssl/Makefile
+++ b/lib/libssl/ssl/Makefile
@@ -4,8 +4,7 @@ LIB=	ssl
 SSLEAYDIST= src
 
 LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl
-SSLEAY_INC= ${.CURDIR}/../${SSLEAYDIST}/include
-LCRYPTO_INC= ${.CURDIR}/../${SSLEAYDIST}/crypto
+LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
 
 .if ${MACHINE_ARCH} == "i386"
 CFLAGS+= -DL_ENDIAN -DBN_ASM
@@ -17,7 +16,39 @@ CFLAGS+= -DB_ENDIAN
 .endif
 .endif
 CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE 
-CFLAGS+= -I${LSSL_SRC} -I${SSLEAY_INC} -I${LCRYPTO_INC}
+CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
+CFLAGS+= -I${LSSL_SRC} -I${LCRYPTO_SRC}
+CFLAGS+= -I${LCRYPTO_SRC}/md2
+CFLAGS+= -I${LCRYPTO_SRC}/md5
+CFLAGS+= -I${LCRYPTO_SRC}/sha
+CFLAGS+= -I${LCRYPTO_SRC}/mdc2
+CFLAGS+= -I${LCRYPTO_SRC}/hmac
+CFLAGS+= -I${LCRYPTO_SRC}/ripemd
+CFLAGS+= -I${LCRYPTO_SRC}/des
+CFLAGS+= -I${LCRYPTO_SRC}/rc2
+CFLAGS+= -I${LCRYPTO_SRC}/rc4
+CFLAGS+= -I${LCRYPTO_SRC}/rc5
+CFLAGS+= -I${LCRYPTO_SRC}/idea
+CFLAGS+= -I${LCRYPTO_SRC}/bf
+CFLAGS+= -I${LCRYPTO_SRC}/cast
+CFLAGS+= -I${LCRYPTO_SRC}/bn
+CFLAGS+= -I${LCRYPTO_SRC}/rsa
+CFLAGS+= -I${LCRYPTO_SRC}/dsa
+CFLAGS+= -I${LCRYPTO_SRC}/dh
+CFLAGS+= -I${LCRYPTO_SRC}/buffer
+CFLAGS+= -I${LCRYPTO_SRC}/bio
+CFLAGS+= -I${LCRYPTO_SRC}/stack
+CFLAGS+= -I${LCRYPTO_SRC}/lhash
+CFLAGS+= -I${LCRYPTO_SRC}/rand
+CFLAGS+= -I${LCRYPTO_SRC}/err
+CFLAGS+= -I${LCRYPTO_SRC}/objects
+CFLAGS+= -I${LCRYPTO_SRC}/evp
+CFLAGS+= -I${LCRYPTO_SRC}/pem
+CFLAGS+= -I${LCRYPTO_SRC}/asn1
+CFLAGS+= -I${LCRYPTO_SRC}/x509
+CFLAGS+= -I${LCRYPTO_SRC}/conf
+CFLAGS+= -I${LCRYPTO_SRC}/txt_db
+CFLAGS+= -I${LCRYPTO_SRC}/pkcs7
 
 SRCS=	s2_meth.c   s2_srvr.c s2_clnt.c  s2_lib.c  s2_enc.c s2_pkt.c \
 	s3_meth.c   s3_srvr.c s3_clnt.c  s3_lib.c  s3_enc.c s3_pkt.c s3_both.c \