From 6ec5f3016511a3ee1bd86f0eeb0915a300cee0bf Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Mon, 2 Jan 2012 21:24:36 +0100 Subject: [PATCH] Do not croak when git is not available targets.mk: if no .git directory is present, assume that Git is not available. Make ORGVERSION, GITVERSION and GITSTATUS customizable from local.mk (override from command line is also possible and probably easier) --- targets.mk | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/targets.mk b/targets.mk index 197962284..49795fc39 100644 --- a/targets.mk +++ b/targets.mk @@ -3,15 +3,20 @@ DISTFILES_extra= Makefile request-assign-future.txt contrib etc .EXPORT_ALL_VARIABLES: -LISPDIRS = lisp -SUBDIRS = doc etc $(LISPDIRS) -INSTSUB = $(SUBDIRS:%=install-%) - -GITVERSION = $(shell git describe --abbrev=6 HEAD) -ORGVERSION = $(subst release_,,$(shell git describe --abbrev=0 HEAD)) -GITSTATUS = $(shell git status -uno --porcelain) -DATE = $(shell date +%Y-%m-%d) -ifneq ("$(GITSTATUS)", "") +LISPDIRS = lisp +SUBDIRS = doc etc $(LISPDIRS) +INSTSUB = $(SUBDIRS:%=install-%) + +ifneq ($(wildcard .git),) + GITVERSION ?= $(shell git describe --abbrev=6 HEAD) + ORGVERSION ?= $(subst release_,,$(shell git describe --abbrev=0 HEAD)) + GITSTATUS ?= $(shell git status -uno --porcelain) +else + GITVERSION ?= N/A + ORGVERSION ?= N/A +endif +DATE = $(shell date +%Y-%m-%d) +ifneq ($(GITSTATUS),) GITVERSION := $(GITVERSION).dirty endif -- 2.11.4.GIT