projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix invalid logger() calls in Solaris device code.
[tinc]
/
src
/
version.c
diff --git
a/src/version.c
b/src/version.c
index
fc62c8a
..
d0af1cc
100644
(file)
--- a/
src/version.c
+++ b/
src/version.c
@@
-1,5
+1,5
@@
/*
/*
- version.c -- version information
+ version.c -- version information
Copyright (C) 2014 Etienne Dechamps <etienne@edechamps.fr>
This program is free software; you can redistribute it and/or modify
Copyright (C) 2014 Etienne Dechamps <etienne@edechamps.fr>
This program is free software; you can redistribute it and/or modify
@@
-18,7
+18,14
@@
*/
#include "version.h"
*/
#include "version.h"
+#include "version_git.h"
+#include "../config.h"
/* This file is always rebuilt (even if there are no changes) so that the following is updated */
/* This file is always rebuilt (even if there are no changes) so that the following is updated */
-const char* const BUILD_DATE = __DATE__;
-const char* const BUILD_TIME = __TIME__;
+const char *const BUILD_DATE = __DATE__;
+const char *const BUILD_TIME = __TIME__;
+#ifdef GIT_DESCRIPTION
+const char *const BUILD_VERSION = GIT_DESCRIPTION;
+#else
+const char *const BUILD_VERSION = VERSION;
+#endif