From 005fcfc60868a5a5fbff2b6f909d5ead8f00c013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Wed, 19 Oct 2016 09:08:56 +0000 Subject: [PATCH] Adding commit version --- include/proxysql.h | 2 +- lib/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/proxysql.h b/include/proxysql.h index d09bf9992..be6bd16ad 100644 --- a/include/proxysql.h +++ b/include/proxysql.h @@ -99,7 +99,7 @@ #else #define DEB "" #endif /* DEBUG */ -#define PROXYSQL_VERSION "1.3.0-alpha" DEB +#define PROXYSQL_VERSION GITVERSION DEB #define PROXYSQL_CODENAME "Truls" #ifndef PROXYSQL_FUNC_DEFS diff --git a/lib/Makefile b/lib/Makefile index 2805fed53..6770b69b8 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,6 +1,6 @@ - +GIT_VERSION := $(shell git describe --long) DEPS_PATH=../deps @@ -39,7 +39,7 @@ ODIR= obj #CFLAGS=$(IDIRS) $(OPTZ) $(DEBUG) -Wall #-lcrypto #CPPFLAGS=-std=c++11 $(CFLAGS) $(LDIRS) $(LIBS) -MYCFLAGS=$(IDIRS) $(OPTZ) $(DEBUG) -Wall +MYCFLAGS=$(IDIRS) $(OPTZ) $(DEBUG) -Wall -DGITVERSION=\"$(GIT_VERSION)\" MYCPPFLAGS=-std=c++11 $(MYCFLAGS) default: libproxysql.a