aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2010-01-19 09:43:18 +0000
committerErlang/OTP <[email protected]>2010-01-19 12:59:54 +0100
commit90ed3d196cdece8e7d5a13709a42118b87c923fe (patch)
tree477ccf12c24b7825ee27a06889669aaa9c377c93
parentce6ca6867f86c8ba876765d25c52cb80a1c10ad4 (diff)
downloadotp-90ed3d196cdece8e7d5a13709a42118b87c923fe.tar.gz
otp-90ed3d196cdece8e7d5a13709a42118b87c923fe.tar.bz2
otp-90ed3d196cdece8e7d5a13709a42118b87c923fe.zip
** Empty commit message **
-rw-r--r--lib/ssl/test/Makefile.src16
-rw-r--r--lib/ssl/vsn.mk2
2 files changed, 1 insertions, 17 deletions
diff --git a/lib/ssl/test/Makefile.src b/lib/ssl/test/Makefile.src
deleted file mode 100644
index c70894707c..0000000000
--- a/lib/ssl/test/Makefile.src
+++ /dev/null
@@ -1,16 +0,0 @@
-# Dummy Makefile.src defined to provide backward compatibility for
-# applications that use both the new SSL (3.0 or later), and older
-# versions of SSL.
-#
-
-SSL_LIB_DIR = @ssl_libdir@
-TARGET = @target@
-SSLEAY_LIB = @SSLEAY_ROOT@/lib
-
-all:
- -echo "Begin dummy make"
- -echo SSL_LIB_DIR = $(SSL_LIB_DIR)
- -echo TARGET = $(TARGET)
- -echo SSLEAY_LIB = $(SSLEAY_LIB)
- -echo SSL_LIB_DIR = $(SSL_LIB_DIR)
- -echo "End dummy make"
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 9eff3bd8e9..2239f2eff4 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -20,7 +20,7 @@
SSL_VSN = 3.10.8
TICKETS = OTP-8327
-TICKETS_3.10.7 = OTP-8260 OTP-8218 OTP-8250
+#TICKETS_3.10.7 = OTP-8260 OTP-8218 OTP-8250
#TICKETS_3.10.6 = OTP-8275