Quellcode durchsuchen

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 vor 13 Jahren
Ursprung
Commit
6ec5f30165
1 geänderte Dateien mit 14 neuen und 9 gelöschten Zeilen
  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