Use Server 2003 rather than Vista as x64 target for tap/tapinstall.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1853 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/install-win32/makebin b/install-win32/makebin
index 66691a94382071b2852606691b8de6f6d9feba89..7547ee1524e9d35998ada39f7205bbbb567400fb 100644 (file)
--- a/install-win32/makebin
+++ b/install-win32/makebin
@@ -33,7 +33,7 @@ if [ -z "$DRVBINSRC" ] ; then
     mkdir bin/tapinstall/i386
     mkdir bin/tapinstall/amd64
     cp tapinstall/objfre_w2k_x86/i386/tapinstall.exe bin/tapinstall/i386
-    cp tapinstall/objfre_wlh_amd64/amd64/tapinstall.exe bin/tapinstall/amd64
+    cp tapinstall/objfre_wnet_amd64/amd64/tapinstall.exe bin/tapinstall/amd64
 else
     cp -a $DRVBINSRC/driver bin/driver
     cp -a $DRVBINSRC/tapinstall bin/tapinstall

diff --git a/install-win32/maketap b/install-win32/maketap
index 728bb854f2ee09fdef5cbbb94584c7613f9842b8..1ee4ed5e8088f34781ba0e2a678dc1e7b9b81d9c 100644 (file)
--- a/install-win32/maketap
+++ b/install-win32/maketap
@@ -8,7 +8,7 @@
 
 amdtarget=""
 if [ -z "$TAP_BIN_AMD64" ]; then
-    amdtarget="fre AMD64 WLH"
+    amdtarget="fre AMD64 WNET"
 fi
 
 if [ -z "$DRVBINSRC" ] ; then

diff --git a/install-win32/maketapinstall b/install-win32/maketapinstall
index 72b81b7819ca88fa095570cc7f8054b950a44cb6..96fd14aab941dccb65fea503ea103b9f9305229c 100644 (file)
--- a/install-win32/maketapinstall
+++ b/install-win32/maketapinstall
@@ -15,7 +15,7 @@ fi
 
 amdtarget=""
 if [ -z "$TI_BIN_AMD64" ]; then
-    amdtarget="fre AMD64 WLH"
+    amdtarget="fre AMD64 WNET"
 fi
 
 if [ -z "$DRVBINSRC" ] ; then

diff --git a/install-win32/version.nsi b/install-win32/version.nsi
index 9e9d4e2d48b3c8eac78f26103746a9f4637229f8..f399cb55f63d80028229903978ab6aa0d5713b80 100644 (file)
--- a/install-win32/version.nsi
+++ b/install-win32/version.nsi
@@ -1,16 +1,12 @@
 # Version numbers, settings, and dependencies
 # for Windows OpenVPN installer.
 
-!define PRODUCT_VERSION "2.1_rc2d"
+!define PRODUCT_VERSION "2.1_rc2e"
 
 # For now, use prebuilt AMD64 tap/tapinstall
 #!define TAP_BIN_AMD64 "../amd64/tap/tap0901.sys"
 #!define TI_BIN_AMD64  "../amd64/tapinstall/tapinstall.exe"
 
-# Copy installer to this directory when finished.
-# If undefined, don't copy installer after generation.
-!define INSTALLER_DEST "/y"
-
 # Prebuilt libraries.  DMALLOC is optional.
 !define OPENSSL_DIR    "../openssl-0.9.7l"
 !define LZO_DIR                "../lzo-2.02"