From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 19 Oct 2016 10:45:22 +0000 (+0200)
Subject: build: introduce $(VERSION) to reduce repeating
X-Git-Tag: v1.2.0-rc1~95^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddd76c0fe3bfcb15d9736491dec351bd81d3984c;p=thirdparty%2Fknot-resolver.git

build: introduce $(VERSION) to reduce repeating
---

diff --git a/Makefile b/Makefile
index da3817802..5f9d7ffc8 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ endif
 
 # Overview
 info:
-	$(info Target:     Knot DNS Resolver $(MAJOR).$(MINOR).$(PATCH)-$(PLATFORM))
+	$(info Target:     Knot DNS Resolver $(VERSION)-$(PLATFORM))
 	$(info Compiler:   $(CC) $(BUILD_CFLAGS))
 	$(info )
 	$(info Variables)
diff --git a/config.mk b/config.mk
index 9a63fe85a..fbed46eaa 100644
--- a/config.mk
+++ b/config.mk
@@ -6,6 +6,8 @@ ABIVER := 1
 BUILDMODE := dynamic
 HARDENING := yes
 
+VERSION := $(MAJOR).$(MINOR).$(PATCH)
+
 # Paths
 PREFIX ?= /usr/local
 BINDIR ?= $(PREFIX)/bin
@@ -27,7 +29,7 @@ INSTALL := install
 # Flags
 BUILD_LDFLAGS += $(LDFLAGS)
 BUILD_CFLAGS := $(CFLAGS) -std=c99 -D_GNU_SOURCE -Wno-unused -Wtype-limits -Wformat -Wformat-security -Wall -I$(abspath .) -I$(abspath lib/generic) -I$(abspath contrib) -I$(abspath contrib/lmdb)
-BUILD_CFLAGS += -DPACKAGE_VERSION="\"$(MAJOR).$(MINOR).$(PATCH)\"" -DPREFIX="\"$(PREFIX)\"" -DMODULEDIR="\"$(MODULEDIR)\"" -DETCDIR="\"$(ETCDIR)\""
+BUILD_CFLAGS += -DPACKAGE_VERSION="\"$(VERSION)\"" -DPREFIX="\"$(PREFIX)\"" -DMODULEDIR="\"$(MODULEDIR)\"" -DETCDIR="\"$(ETCDIR)\""
 ifeq (,$(findstring -O,$(CFLAGS)))
 	BUILD_CFLAGS += -O2
 endif
diff --git a/daemon/daemon.mk b/daemon/daemon.mk
index 10bb69781..24c196a0f 100644
--- a/daemon/daemon.mk
+++ b/daemon/daemon.mk
@@ -45,7 +45,7 @@ date := $(shell date +%F)
 daemon: $(kresd)
 daemon-install: kresd-install bindings-install
 ifneq ($(SED),)
-	$(SED) -e "s/@VERSION@/$(MAJOR).$(MINOR).$(PATCH)/" -e "s/@DATE@/$(date)/" doc/kresd.8.in > doc/kresd.8
+	$(SED) -e "s/@VERSION@/$(VERSION)/" -e "s/@DATE@/$(date)/" doc/kresd.8.in > doc/kresd.8
 	$(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)/man8/
 	$(INSTALL) -m 0644 doc/kresd.8 $(DESTDIR)$(MANDIR)/man8/
 endif
diff --git a/lib/lib.mk b/lib/lib.mk
index ae72f5ddd..01857b8ec 100644
--- a/lib/lib.mk
+++ b/lib/lib.mk
@@ -79,7 +79,7 @@ libkres.pc:
 	@echo 'Name: libkres' >> $@
 	@echo 'Description: Knot DNS Resolver library' >> $@
 	@echo 'URL: https://www.knot-resolver.cz' >> $@
-	@echo 'Version: $(MAJOR).$(MINOR).$(PATCH)' >> $@
+	@echo 'Version: $(VERSION)' >> $@
 	@echo 'Libs: -L$${libdir} -lkres' >> $@
 	@echo 'Cflags: -I$${includedir}' >> $@
 libkres-pcinstall: libkres.pc libkres-install