Made domake-win builds to use easy-rsa/2.0/openssl-1.0.0.cnf

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>

diff --git a/install-win32/Makefile.am b/install-win32/Makefile.am
index 7211de2ea1105a308f1b05160bf1552499f0deed..75932fef567858790c961c2377e1ebe7a18014d0 100644 (file)
--- 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 b6e4a07dbfeb84d2b6b4c90dc8019c290e5e3608..f06c5aa64b197a18cccba46230b590074df138b5 100755 (executable)
--- 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"