瀏覽代碼

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)
Achim Gratz 13 年之前
父節點
當前提交
6ec5f30165
共有 1 個文件被更改,包括 14 次插入9 次删除
  1. 14 9
      targets.mk

+ 14 - 9
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