summaryrefslogtreecommitdiffstats
path: root/install-win32/buildinstaller
diff options
context:
space:
mode:
Diffstat (limited to 'install-win32/buildinstaller')
-rw-r--r--install-win32/buildinstaller14
1 files changed, 3 insertions, 11 deletions
diff --git a/install-win32/buildinstaller b/install-win32/buildinstaller
index d906edf..83057bb 100644
--- a/install-win32/buildinstaller
+++ b/install-win32/buildinstaller
@@ -4,19 +4,11 @@
. autodefs/defs.sh
# build the installer
-cd install-win32
-rm -f *.exe
-'/c/Program Files/NSIS/makensis' openvpn.nsi &>makensis.log
+rm -f $GENOUT/*.exe
+'/c/Program Files/NSIS/makensis' $GENOUT/nsi/openvpn.nsi &>makensis.log
tail -20 makensis.log
-# copy the installer to GENOUT/install
-ls openvpn*.exe 2>/dev/null || exit 1
-i=`ls -t openvpn*.exe | head -n 1`
-cd ..
-mkdir $GENOUT/install &>/dev/null
-cp install-win32/$i $GENOUT/install
-
# sign the installer
if [ -d "$SIGNTOOL" ]; then
- TARGET_EXE="$(pwd)/$GENOUT/install/$i" $SIGNTOOL/signexe
+ TARGET_EXE="$(echo $(pwd)/$GENOUT/*.exe)" $SIGNTOOL/signexe
fi