From 8f4e4f67b843c234e47dcc8a5c4b44c574d66527 Mon Sep 17 00:00:00 2001 From: Thorsten von Eicken Date: Wed, 3 Jun 2015 21:59:15 -0700 Subject: [PATCH] Makefile tweaks --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b294b2f..332bde8 100644 --- a/Makefile +++ b/Makefile @@ -52,12 +52,12 @@ LED_SERIAL_PIN ?= 2 # This queries git to produce a version string like "esp-link v0.9.0 2015-06-01 34bc76" # If you don't have a proper git checkout or are on windows, then simply swap for the constant -VERSION := "esp-link custom version" +#VERSION ?= "esp-link custom version" DATE := $(shell date '+%F %T') -BRANCH := $(shell git rev-parse --abbrev-ref HEAD) +BRANCH := $(shell git describe --tags) SHA := $(shell if git diff --quiet HEAD; then git rev-parse --short HEAD | cut -d"/" -f 3; \ else echo "development"; fi) -VERSION := esp-link - $(BRANCH) - $(DATE) - $(SHA) +VERSION ?="esp-link $(BRANCH) - $(DATE) - \#$(SHA)" # --------------- esphttpd config options ---------------