GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-05-18 05:45:45 +02:00
Code Packages

Makefile: Specify version when building from tarball

Browse Source 
When package maintainers build from a tarball, the .git directory does
not exist to extract the version tag. Let's add a hack to work around
this issue and let them specify `BEES_VERSION="v0.y"` on the make
cmdline.

Github-Bug: https://github.com/Zygo/bees/issues/75
Signed-off-by: Kai Krakow <kai@kaishome.de>
This commit is contained in:
Kai Krakow 2018-09-30 04:15:46 +02:00
parent 3504439d5c
commit cf9d1d0b78
No known key found for this signature in database
GPG Key ID: 046FAC3028D76321
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -9,6 +9,8 @@ SYSTEMD_SYSTEM_UNIT_DIR ?= $(shell pkg-config systemd --variable=systemdsystemun
MARKDOWN := $(firstword $(shell type -P markdown markdown2 markdown_py 2>/dev/null || echo markdown)) MARKDOWN := $(firstword $(shell type -P markdown markdown2 markdown_py 2>/dev/null || echo markdown))
BEES_VERSION ?= $(shell git describe --always --dirty || echo UNKNOWN)
# allow local configuration to override above variables # allow local configuration to override above variables
-include localconf -include localconf
@ -36,7 +38,7 @@ lib: ## Build libs
src: ## Build bins src: ## Build bins
src: lib src: lib
$(MAKE) -C src $(MAKE) BEES_VERSION="$(BEES_VERSION)" -C src
test: ## Run tests test: ## Run tests
test: lib src test: lib src

2
src/Makefile
View File

@ -20,7 +20,7 @@ BEES_OBJS = \
bees-types.o \ bees-types.o \
bees-version.c: bees.h $(BEES_OBJS:.o=.cc) Makefile bees-version.c: bees.h $(BEES_OBJS:.o=.cc) Makefile
echo "const char *BEES_VERSION = \"$(shell git describe --always --dirty || echo UNKNOWN)\";" > bees-version.new.c echo "const char *BEES_VERSION = \"$(BEES_VERSION)\";" > bees-version.new.c
mv -f bees-version.new.c bees-version.c mv -f bees-version.new.c bees-version.c
.depends/%.dep: %.cc Makefile .depends/%.dep: %.cc Makefile