build: introduce $(VERSION) to reduce repeating

diff --git a/Makefile b/Makefile
index da381780206ae3b51a846e929c75dfd5e5c20f88..5f9d7ffc84fa7926477c0d19be38c657093fa2ce 100644 (file)
--- 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 9a63fe85abc2b2fc3a6009bcc10a02bd903b2437..fbed46eaa1ec456d94fa408a9a5772da52cb35d5 100644 (file)
--- 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 10bb69781e8ccac17748a2b402df96481e860a4b..24c196a0f4aecf5db2387ec9a572881568f90c42 100644 (file)
--- 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 ae72f5ddd14a682b1a33d89fbd20b42aa8f0317a..01857b8ec032f92bb6411e9ee79ec33925040582 100644 (file)
--- 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