From 1bda73a7b0f45a2502ae93e33e30b98152d893f3 Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Mon, 12 May 2008 20:31:43 +0000
Subject: Moved branch into official BETA21 position.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2959 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 install-win32/makeopenvpn | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'install-win32/makeopenvpn')

diff --git a/install-win32/makeopenvpn b/install-win32/makeopenvpn
index e3aef48..c1a805d 100644
--- a/install-win32/makeopenvpn
+++ b/install-win32/makeopenvpn
@@ -1,19 +1,37 @@
 #!/bin/sh
 
+H=`pwd`
+
 # get version.nsi definitions
 . autodefs/defs.sh
 
 if gcc --version &>/dev/null && [ -d "$OPENSSL_DIR" ] && [ -d "$LZO_DIR" ] && [ -d "$PKCS11_HELPER_DIR" ]; then
     # build OpenVPN binary
-    [ "$CLEAN" = "yes" ] && make -f makefile.w32 clean
-    make -f makefile.w32 -j $MAKE_JOBS
 
-    # copy OpenVPN executable to GENOUT/bin
+    if ! [ -f Makefile ]; then
+	autoreconf -i -v \
+	&& ./configure \
+	    --enable-strict \
+	    --prefix=$H/windest \
+	    MAN2HTML=true \
+	    --with-ssl-headers=$H/$OPENSSL_DIR/include \
+	    --with-ssl-lib=$H/$OPENSSL_DIR/out \
+	    --with-lzo-headers=$H/$LZO_DIR/include \
+	    --with-lzo-lib=$H/$LZO_DIR \
+	    --with-pkcs11-helper-headers=$H/$PKCS11_HELPER_DIR/usr/local/include \
+	    --with-pkcs11-helper-lib=$H/$PKCS11_HELPER_DIR/usr/local/lib
+    fi
+
+    make -j $MAKE_JOBS && make install
+
+    # copy OpenVPN and service executables to GENOUT/bin
     mkdir -p $GENOUT/bin &>/dev/null
-    cp $PRODUCT_UNIX_NAME.exe $GENOUT/bin
+    cp windest/sbin/openvpn.exe $GENOUT/bin
+    cp windest/sbin/openvpnserv.exe $GENOUT/bin
     if [ -z "$NO_STRIP" ]; then
-	strip $GENOUT/bin/$PRODUCT_UNIX_NAME.exe
+	strip $GENOUT/bin/openvpn.exe
+	strip $GENOUT/bin/openvpnserv.exe
     fi
 else
-    echo DID NOT BUILD openvpn.exe because one or more of gcc, OPENSSL_DIR, LZO_DIR, or PKCS11_HELPER_DIR directories were missing
+    echo DID NOT BUILD openvpn.exe and openvpnserv.exe because one or more of gcc, OPENSSL_DIR, LZO_DIR, or PKCS11_HELPER_DIR directories were missing
 fi
-- 
cgit v1.2.3