From 3038f342dc2c6c462b51745621c5f7321da81a96 Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Mon, 5 Mar 2007 20:36:31 +0000
Subject: Include tap.cat (TAP driver catalog file) in Windows installer.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1753 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 configure.ac                 | 2 +-
 install-win32/openvpn.nsi.in | 2 ++
 install-win32/prebuild       | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index eb8f040..64789cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
 
-AC_INIT([OpenVPN], [2.1_rc2], [openvpn-users@lists.sourceforge.net], [openvpn])
+AC_INIT([OpenVPN], [2.1_rc2a], [openvpn-users@lists.sourceforge.net], [openvpn])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR(syshead.h)
 
diff --git a/install-win32/openvpn.nsi.in b/install-win32/openvpn.nsi.in
index 8c24158..bcb142a 100755
--- a/install-win32/openvpn.nsi.in
+++ b/install-win32/openvpn.nsi.in
@@ -341,6 +341,7 @@ tap-32bit:
 
   SetOutPath "$INSTDIR\driver"
   File "${HOME}\tap-win32\i386\OemWin2k.inf"
+  File "${HOME}\tap-win32\i386\tap.cat"
   File "${HOME}\tap-win32\i386\${TAPDRV}"
 
   tapend:
@@ -584,6 +585,7 @@ Section "Uninstall"
   Delete "$INSTDIR\log\README.txt"
 
   Delete "$INSTDIR\driver\OemWin2k.inf"
+  Delete "$INSTDIR\driver\tap.cat"
   Delete "$INSTDIR\driver\${TAPDRV}"
 
   Delete "$INSTDIR\bin\openssl.exe"
diff --git a/install-win32/prebuild b/install-win32/prebuild
index 95b93de..a15a6fd 100755
--- a/install-win32/prebuild
+++ b/install-win32/prebuild
@@ -105,8 +105,8 @@ cp $IN/tap-win32/MAKEFILE $OUT/tap-win32
 cp $IN/tap-win32/SOURCES $OUT/tap-win32
 
 mkdir $OUT/tap-win32/i386
-cp $IN/tap-win32/i386/OemWin2k.inf $OUT/tap-win32/i386
-cp $IN/tap-win32/i386/tap.cat $OUT/tap-win32/i386
+cp $TAPBIN/OemWin2k.inf $OUT/tap-win32/i386
+cp $TAPBIN/tap.cat $OUT/tap-win32/i386
 cp $TAPBIN/tap0901.sys $OUT/tap-win32/i386
 
 #mkdir $OUT/tap-win32/amd64
-- 
cgit