From 5526c432c74c4196de724d2da7a43b186eb249b0 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Mon, 29 Jul 2013 17:48:48 +0200 Subject: build: use VERSION_SHORT instead of VERSION_STRING We have recently changed VERSION_STRING to append CONFIG_RC at the end of the string. Thus, for the build system, change it to VERSION_SHORT where needed, e.g. in release targets where the "+" appendix is not wished. Signed-off-by: Daniel Borkmann --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 15994a6..5a467c4 100644 --- a/Makefile +++ b/Makefile @@ -102,8 +102,9 @@ ifeq ("$(origin CROSS_LD_LIBRARY_PATH)", "command line") LDFLAGS += -L$(CROSS_LD_LIBRARY_PATH) endif -VERSION_STRING = "$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(CONFIG_RC)" -VERSION_LONG = "$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(CONFIG_RC) ($(NAME))" +VERSION_SHORT = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) +VERSION_STRING = "$(VERSION_SHORT)$(CONFIG_RC)" +VERSION_LONG = "$(VERSION_SHORT)$(CONFIG_RC) ($(NAME))" export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION export CROSS_COMPILE -- cgit v1.2.3-54-g00ecf