From: David Woodhouse <David.Woodhouse@intel.com>
Date: Thu, 8 Nov 2012 13:31:23 +0000 (+0000)
Subject: Include version.c from build dir in preference to source dir
X-Git-Tag: v4.99~18
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3db71d95f67d800d3990d2865b0ba021c3bcaba9;p=users%2Fdwmw2%2Fopenconnect.git

Include version.c from build dir in preference to source dir

This should fix out-of-source-tree builds from a tarball, which
otherwise would use the autogenerated $(objdir)/version.c for building
the library, but the pre-packaged $(srcdir)/version.c for the
executable. This is because the latter was included directly from main.c
by #include "version.c". By changing to #include <main.c> instead, we get
to use the new auto-generated one instead if anything's been changed.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/main.c b/main.c
index 40da6519..258932fb 100644
--- a/main.c
+++ b/main.c
@@ -72,7 +72,7 @@ static void init_stoken(struct openconnect_info *vpninfo,
 /* A sanity check that the openconnect executable is running against a
    library of the same version */
 #define openconnect_version_str openconnect_binary_version
-#include "version.c"
+#include <version.c>
 #undef openconnect_version_str
 
 int verbose = PRG_INFO;