Fix so to not require a make obj - Fix cleandir target to remove the headers

Configure munges from OBJDIR.

1 files changed, 14 insertions, 1 deletions

diff --git a/src/lib/libssl/Makefile.bsd-wrapper b/src/lib/libssl/Makefile.bsd-wrapper
index b8189988cd..05596a4641 100644
--- a/src/lib/libssl/Makefile.bsd-wrapper
+++ b/src/lib/libssl/Makefile.bsd-wrapper
@@ -32,6 +32,17 @@ SSLCONF=	OpenBSD-bigendian
 .endif
 
 
+MUNGEDFILES =   ${.OBJDIR}/${SSL_SRC}/crypto/bf/bf_locl.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/bn/bn.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/des/des.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/des/des_locl.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/idea/idea.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/md2/md2.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/rc2/rc2.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/rc4/rc4.h \
+                ${.OBJDIR}/${SSL_SRC}/crypto/rc4/rc4_locl.h
+
+
 .include <bsd.own.mk>
 
 .if exists(src-patent)
@@ -52,14 +63,16 @@ install:
 ${.OBJDIR}/${SSL_SRC}/crypto/md2/md2.h : ${.OBJDIR}/${SSL_SRC}/Makefile.ssl
         (cd ${.OBJDIR}/${SSL_SRC}; /usr/bin/perl Configure ${SSLCONF}) 
 
+.if !exists(${.OBJDIR}/${SSL_SRC}/Makefile.ssl)
 ${.OBJDIR}/${SSL_SRC}/Makefile.ssl: ${.CURDIR}/${SSL_SRC}/Makefile.ssl
         (${LNDIR} -s -e obj -e obj.${MACHINE_ARCH} -e Makefile.bsd-wrapper -e Makefile.ssl ${.CURDIR}; cp ${.CURDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC})
+.endif
 
 clean:  ${.OBJDIR}/${SSL_SRC}/Makefile.ssl
         (cd ${.OBJDIR}; ${MAKE} clean)
 
 cleandir: ${.OBJDIR}/${SSL_SRC}/Makefile.ssl
-        (cd ${.OBJDIR}; rm -f ${SSL_SRC}/crypto/md2/md2.h; ${MAKE} cleandir)
+        (cd ${.OBJDIR}; rm -f ${MUNGEDFILES}; ${MAKE} cleandir)
 
 test:
         # Nothing here so far...