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

diff --git a/configure.ac b/configure.ac
index eb8f040cc064bf916ea8a6d30cabd807a3b9a881..64789cf433bb06d4a0ab2cc0c66e7903b582227f 100644 (file)
--- 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 8c24158bd5890b2d8dd5b6d51117599bcf8c9dfa..bcb142a1669022a0ed4835055834e02b88a2158d 100755 (executable)
--- 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 95b93de226e4f16872156a7591bdaa6bc1045934..a15a6fdd8d1dd3c4c3213928603939f795d0326a 100755 (executable)
--- 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