From 0039dd40464ea8544022abb32e220224ab71d6e5 Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Wed, 7 Mar 2007 07:08:49 +0000
Subject: Cleaned up Windows build scripts.

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

(limited to 'install-win32/winconfig')

diff --git a/install-win32/winconfig b/install-win32/winconfig
index 583bd89..bca1bb6 100644
--- a/install-win32/winconfig
+++ b/install-win32/winconfig
@@ -10,22 +10,22 @@ mkdir autodefs
 
 TRAN="perl install-win32/nsitran.pl"
 VER=install-win32/version.nsi
-MACRO="perl install-win32/macro.pl $HSV"
-PATCH="/tmp/p.exe"
+MACRO="perl install-win32/macro.pl $VER"
 
 # silly vista security theatre
+PATCH="/tmp/p.exe"
 cp `which patch` $PATCH
 
 # translate version.nsi to C and sh
 $TRAN  c <$VER >autodefs/nsidefs.h
 $TRAN sh <$VER >autodefs/nsidefs.sh
 
-# get version.nsi definitions
+# load version.nsi definitions
 . autodefs/nsidefs.sh
 
 # configure tap driver sources
-$MACRO $VER <tap-win32/SOURCES.in >tap-win32/SOURCES
-$MACRO $VER <tap-win32/i386/OemWin2k.inf.in >tap-win32/i386/OemWin2k.inf
+$MACRO <tap-win32/SOURCES.in >tap-win32/SOURCES
+$MACRO <tap-win32/i386/OemWin2k.inf.in >tap-win32/i386/OemWin2k.inf
 rm -rf tap-win32/amd64
 mkdir tap-win32/amd64
 cp tap-win32/i386/OemWin2k.inf tap-win32/amd64
@@ -33,12 +33,14 @@ cd tap-win32/amd64
 $PATCH <../inf64.patch
 
 # configure service
-cd $c
-cp $SVC_TEMPLATE/service.[ch] service-win32
-cd service-win32
-cp service.c service.c.orig
-cp service.h service.h.orig
-$PATCH <service.patch
+if [ -n "$SVC_TEMPLATE" ] ; then
+    cd $c
+    cp $SVC_TEMPLATE/service.[ch] service-win32
+    cd service-win32
+    cp service.c service.c.orig
+    cp service.h service.h.orig
+    $PATCH <service.patch
+fi
 
 # build license file
 cd $c
-- 
cgit v1.2.3