-- Samuli Seppänen Community Manager OpenVPN Technologies, Inc irc freenode net: mattock
>From e46bee78a2d5bbdfc140bccad37c37344a32e604 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Samuli=20Sepp=C3=A4nen?= <sam...@openvpn.net> List-Post: openvpn-devel@lists.sourceforge.net Date: Mon, 3 Jan 2011 16:08:37 +0200 Subject: [PATCH 3/6] Added PKCS11_HELPER_DIR directive to win/settings.in. This variable is needed when NSI installer generation is integrated to the Python-based build system. --- win/settings.in | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/win/settings.in b/win/settings.in index f8eeb20..0dd3bfc 100644 --- a/win/settings.in +++ b/win/settings.in @@ -1,5 +1,9 @@ # Version numbers, settings, and dependencies # for Windows OpenVPN installer. +# +# Note that some variables are parsed by wb.py from version.m4 and are not +# stored in this file. This is done to allow using the old and new Windows build +# systems side-by-side # Branding !define PRODUCT_NAME "OpenVPN" @@ -17,13 +21,13 @@ # Prebuilt libraries. DMALLOC is optional. !define OPENSSL_DIR "../openssl" !define LZO_DIR "../lzo" +!define PKCS11_HELPER_DIR "../pkcs11-helper" # write output files here !define DIST "dist" -# tapinstall.exe source code. -# Not needed if DRVBINSRC is defined -# (or if using pre-built mode). +# devcon.exe (a.k.a. tapinstall.exe) source code. Not needed if DRVBINSRC is +# defined (or if using pre-built mode). !define TISRC "../tapinstall" # TAP Adapter parameters. Note that PRODUCT_TAP_ID is -- 1.6.3.3
