summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-11-05 11:33:18 +0100
committerErich Eckner <git@eckner.net>2018-11-05 11:33:18 +0100
commit06fdb666a1b473197c0a8bfdadb553fd34c7f853 (patch)
tree8a847607049b4c84458cd770168390221fb5d994
parent4d0d048c8b16307670dd97cab18624ab3b09cb1a (diff)
parentab3449f5ac7c5682520bc13a439c1d37ca2953ae (diff)
downloadasp32-06fdb666a1b473197c0a8bfdadb553fd34c7f853.tar.xz
Merge remote-tracking branch 'upstream/master'
-rw-r--r--Makefile7
1 files changed, 1 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index beb3758..02b9508 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,6 @@
PACKAGE_NAME = asp32
-VERSION = $(shell git describe --exact-match)
-VDEVEL = $(shell test -d .git && git describe --dirty 2>/dev/null)
-
-ifneq "$(VDEVEL)" ""
-VERSION = $(VDEVEL)
-endif
+VERSION = $(shell git describe --dirty 2>/dev/null)
PREFIX = /usr/local