From d22a3799f51c58525a715f767613731669bba98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuli=20Sepp=C3=A4nen?= Date: Wed, 29 Jun 2011 11:24:08 +0300 Subject: Made domake-win builds to use easy-rsa/2.0/openssl-1.0.0.cnf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Samuli Seppänen Acked-by: David Sommerseth Signed-off-by: David Sommerseth --- install-win32/Makefile.am | 6 +++--- install-win32/openvpn.nsi | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install-win32/Makefile.am b/install-win32/Makefile.am index 7211de2..75932fe 100644 --- a/install-win32/Makefile.am +++ b/install-win32/Makefile.am @@ -57,7 +57,7 @@ nodist_doc_DATA = tmp/license.txt confdir = $(win32datadir)/config nodist_conf_DATA = \ - tmp/openssl.cnf.sample \ + tmp/openssl-1.0.0.cnf \ tmp/client.ovpn \ tmp/server.ovpn dist_conf_DATA = \ @@ -83,8 +83,8 @@ tmp/server.ovpn: tmp $(top_srcdir)/sample-config-files/server.conf tmp/license.txt: tmp $(top_srcdir)/COPYING $(top_srcdir)/COPYRIGHT.GPL cat $(top_srcdir)/COPYING $(top_srcdir)/COPYRIGHT.GPL > tmp/license.txt -tmp/openssl.cnf.sample: tmp $(top_srcdir)/easy-rsa/2.0/openssl.cnf - cp $(top_srcdir)/easy-rsa/2.0/openssl.cnf tmp/openssl.cnf.sample +tmp/openssl-1.0.0.cnf: tmp $(top_srcdir)/easy-rsa/2.0/openssl-1.0.0.cnf + cp $(top_srcdir)/easy-rsa/2.0/openssl-1.0.0.cnf tmp/openssl-1.0.0.cnf clean-local: -rm -fr tmp diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi index b6e4a07..f06c5aa 100755 --- a/install-win32/openvpn.nsi +++ b/install-win32/openvpn.nsi @@ -333,7 +333,7 @@ Section "${PRODUCT_NAME} RSA Certificate Management Scripts" SecOpenVPNEasyRSA SetOverwrite on SetOutPath "$INSTDIR\easy-rsa" - File "${GEN}\easy-rsa\openssl.cnf.sample" + File "${GEN}\easy-rsa\openssl-1.0.0.cnf" File "${GEN}\easy-rsa\vars.bat.sample" File "${GEN}\easy-rsa\init-config.bat" @@ -850,7 +850,7 @@ Section "Uninstall" Delete "$INSTDIR\license.txt" Delete "$INSTDIR\Uninstall.exe" - Delete "$INSTDIR\easy-rsa\openssl.cnf.sample" + Delete "$INSTDIR\easy-rsa\openssl-1.0.0.cnf" Delete "$INSTDIR\easy-rsa\vars.bat.sample" Delete "$INSTDIR\easy-rsa\init-config.bat" Delete "$INSTDIR\easy-rsa\README.txt" -- cgit v1.2.3