aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2011-02-28 14:57:49 +0100
committerDavid Sommerseth <davids@redhat.com>2011-02-28 15:35:40 +0100
commit26eaa885b0a84e5a020c7d463a261f3d819af7a1 (patch)
tree7959c78a8fcfbb2df325e9bce5763b665e5d26fc
parentPreparing for the OpenVPN 2.2-RC release (diff)
downloadopenvpn-26eaa885b0a84e5a020c7d463a261f3d819af7a1.tar.xz
Fix packaging of config-win32.h and service-win32/msvc.makv2.2-RC
The config-win32.h and service-win32/msvc.mak was not included into the final source balls when using 'make dist', which is crucial for Windows building. Signed-off-by: David Sommerseth <davids@redhat.com> Acked-by: Samuli Seppänen <samuli@openvpn.net>
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.am6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 57ba005..2626cec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,10 @@ OpenVPN Change Log
Copyright (C) 2002-2011 OpenVPN Technologies, Inc. <sales@openvpn.net>
2011.02.28 -- Version 2.2-RC
-David Sommerseth (2):
+David Sommerseth (3):
Make the --x509-username-field feature an opt-in feature
Fix compiler warning when compiling against OpenSSL 1.0.0
+ Fix packaging of config-win32.h and service-win32/msvc.mak
James Yonan (1):
Minor addition of logging info before and after execution of Windows net commands.
diff --git a/Makefile.am b/Makefile.am
index 41f2008..1c9468c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,8 @@ SUBDIRS = \
TESTS = t_client.sh t_lpback.sh t_cltsrv.sh
sbin_PROGRAMS = openvpn
-dist_noinst_HEADERS =
+dist_noinst_HEADERS = \
+ config-win32.h
dist_noinst_SCRIPTS = \
$(TESTS) \
@@ -73,7 +74,8 @@ dist_noinst_DATA = \
openvpn.spec \
COPYRIGHT.GPL \
PORTS \
- INSTALL-win32.txt
+ INSTALL-win32.txt \
+ service-win32/msvc.mak
openvpn_SOURCES = \
base64.c base64.h \