summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2000-12-15 20:32:33 +0000
committerBob Beck <beck@cvs.openbsd.org>2000-12-15 20:32:33 +0000
commitb309f08418c857ff3a57f68c0350f30e0ce7960a (patch)
tree2f735044d74d61dff56743e9b0387166ba8a59be
parentd7ba6e92acfa29aa64b2d44ea8a5c9714c68d6c3 (diff)
oops, forgot top level makefile.bsd-wrapper on merge
-rw-r--r--lib/libssl/Makefile.bsd-wrapper10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/libssl/Makefile.bsd-wrapper b/lib/libssl/Makefile.bsd-wrapper
index d4426d022cc..0776ad0f07c 100644
--- a/lib/libssl/Makefile.bsd-wrapper
+++ b/lib/libssl/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
# Build wrapper for OpenSSL
-# $OpenBSD: Makefile.bsd-wrapper,v 1.26 2000/11/19 21:22:04 millert Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.27 2000/12/15 20:32:32 beck Exp $
# Our lndir is hacked; specify a full path to avoid potential conflicts
# with the one installed with X11.
@@ -505,8 +505,12 @@ prereq: ${.OBJDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}/crypto/objects/
install: maninstall
cd ${.OBJDIR} && ${MAKE} install
-${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h: ${.OBJDIR}/${SSL_SRC}/crypto/objects/objects.h
- /usr/bin/perl ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.pl ${.OBJDIR}/${SSL_SRC}/crypto/objects/objects.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h
+#${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h: ${.OBJDIR}/${SSL_SRC}/crypto/objects/objects.h
+# /usr/bin/perl ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.pl ${.OBJDIR}/${SSL_SRC}/crypto/objects/objects.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h
+# Stupid ssl 0.9.6 fucks this up completely, won't even build if you
+# try to regenerate obj_dat.h - even with a stock distrib.
+${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h: ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h.src
+ cp ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h.src ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h
${.OBJDIR}/${SSL_SRC}/Makefile.ssl : ${.OBJDIR}/${SSL_SRC}/Makefile.org
cd ${.OBJDIR}/${SSL_SRC} && /usr/bin/perl Configure ${SSLCONF}