diff options
| author | Samuli Seppänen <samuli@openvpn.net> | 2011-06-29 11:24:08 +0300 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2011-07-01 10:31:42 +0200 |
| commit | 5d14fcd885d19de42f3da45c94568ee934075949 (patch) | |
| tree | 1266948c14e1e57e9e6dcaed1e2611726939328a | |
| parent | 4ec60a5839c73b3840ad9297e9d9d15893085eff (diff) | |
| download | openvpn-5d14fcd885d19de42f3da45c94568ee934075949.tar.gz openvpn-5d14fcd885d19de42f3da45c94568ee934075949.tar.xz openvpn-5d14fcd885d19de42f3da45c94568ee934075949.zip | |
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>
| -rw-r--r-- | install-win32/Makefile.am | 6 | ||||
| -rwxr-xr-x | 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" |