upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-06-14 20:10:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added optional files SAMPCONF_CONF2 (second sample configuration

Browse source 
file) and SAMPCONF_DH (Diffie-Helman parameters) to Windows
build system, and may be defined in settings.in.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3450 e7ae566f-a301-0410-adde-c780ea21d3b5
This commit is contained in:
james 2008-10-24 06:04:34 +00:00
parent 63903a8220
commit 9bf6e9ac04
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
install-win32/maketext
View file

@ -45,9 +45,11 @@ if [ -n "$SAMPCONF_DIR" ]; then
c=$GENOUT/conf
mkdir -p $c &>/dev/null
test -n "$SAMPCONF_CONF" && cp "../$SAMPCONF_DIR/$SAMPCONF_CONF" $c
test -n "$SAMPCONF_CONF2" && cp "../$SAMPCONF_DIR/$SAMPCONF_CONF2" $c
test -n "$SAMPCONF_P12" && cp "../$SAMPCONF_DIR/$SAMPCONF_P12" $c
test -n "$SAMPCONF_TA" && cp "../$SAMPCONF_DIR/$SAMPCONF_TA" $c
test -n "$SAMPCONF_CA" && cp "../$SAMPCONF_DIR/$SAMPCONF_CA" $c
test -n "$SAMPCONF_CRT" && cp "../$SAMPCONF_DIR/$SAMPCONF_CRT" $c
test -n "$SAMPCONF_KEY" && cp "../$SAMPCONF_DIR/$SAMPCONF_KEY" $c
test -n "$SAMPCONF_DH" && cp "../$SAMPCONF_DIR/$SAMPCONF_DH" $c
fi

12
install-win32/openvpn.nsi
View file

@ -505,6 +505,9 @@ Section -post
!ifdef SAMPCONF_CONF
File "${GEN}\conf\${SAMPCONF_CONF}"
!endif
!ifdef SAMPCONF_CONF2
File "${GEN}\conf\${SAMPCONF_CONF2}"
!endif
!ifdef SAMPCONF_P12
File "${GEN}\conf\${SAMPCONF_P12}"
!endif
@ -520,6 +523,9 @@ Section -post
!ifdef SAMPCONF_KEY
File "${GEN}\conf\${SAMPCONF_KEY}"
!endif
!ifdef SAMPCONF_DH
File "${GEN}\conf\${SAMPCONF_DH}"
!endif
!endif
;
@ -762,6 +768,9 @@ Section "Uninstall"
!ifdef SAMPCONF_CONF
Delete "$INSTDIR\config\${SAMPCONF_CONF}"
!endif
!ifdef SAMPCONF_CONF2
Delete "$INSTDIR\config\${SAMPCONF_CONF2}"
!endif
!ifdef SAMPCONF_P12
Delete "$INSTDIR\config\${SAMPCONF_P12}"
!endif
@ -777,6 +786,9 @@ Section "Uninstall"
!ifdef SAMPCONF_KEY
Delete "$INSTDIR\config\${SAMPCONF_KEY}"
!endif
!ifdef SAMPCONF_DH
Delete "$INSTDIR\config\${SAMPCONF_DH}"
!endif
!endif
!ifdef USE_GUI