"foo.h" -> <ssl/foo.h> in ssl includes, so we do not need -I/usr/include/ssl

and we won't be bothered by nameclashes with application headers

2 files changed, 18 insertions, 10 deletions

diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index fc1a092225..e2c1c4f858 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/lib/libssl/crypto/Makefile
@@ -164,14 +164,18 @@ HDRS= 	asn1/asn1.h asn1/asn1_mac.h bf/blowfish.h bio/bio.h \
         ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}
 
 includes:
-        @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \
-                j="cmp -s ${LCRYPTO_SRC}/$$i \
-                ${DESTDIR}/usr/include/ssl/`basename $$i` || \
+        @d=`mktemp -d /tmp/libsslXXXXXXXXXX`; \
+        cd ${LCRYPTO_SRC}; for i in $(HDRS); do \
+                f=`basename $$i`; \
+                j="sed 's/#include \"\\([^\"]*\\)\"/#include <ssl\\/\\1>/' \
+                       ${LCRYPTO_SRC}/$$i >$$d/$$f && \
+                (cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \
                 ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
-                ${LCRYPTO_SRC}/$$i ${DESTDIR}/usr/include/ssl"; \
+                           $$d/$$f ${DESTDIR}/usr/include/ssl)"; \
                 echo $$j; \
                 eval "$$j"; \
-        done
+        done; \
+        rm -rf $$d
 
 
 .include <bsd.lib.mk>
diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
index 6fffdd9ef2..02bec28066 100644
--- a/src/lib/libssl/ssl/Makefile
+++ b/src/lib/libssl/ssl/Makefile
@@ -73,13 +73,17 @@ HDRS=	ssl.h ssl2.h ssl3.h ssl23.h tls1.h
 .PATH:  ${LSSL_SRC}
 
 includes:
-        @cd ${LSSL_SRC}; for i in $(HDRS); do \
-                j="cmp -s $$i ${DESTDIR}/usr/include/ssl/`basename $$i` || \
+        @d=`mktemp -d /tmp/libsslXXXXXXXXXX`; \
+        cd ${LSSL_SRC}; for i in $(HDRS); do \
+                f=`basename $$i`; \
+                j="sed 's/#include \"\\([^\"]*\\)\"/#include <ssl\\/\\1>/' \
+                       $$i >$$d/$$f && \
+                (cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \
                 ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
-                $$i ${DESTDIR}/usr/include/ssl"; \
+                $$d/$$f ${DESTDIR}/usr/include/ssl)"; \
                 echo $$j; \
                 eval "$$j"; \
-        done
-
+        done; \
+        rm -rf $$d
 
 .include <bsd.lib.mk>