Changeset 89982ec

Timestamp:

Dec 24, 2009, 10:35:46 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

f0f2eec

Parents:

980fa31

git-author:

Anders Kaseorg <andersk@mit.edu> (12/24/09 21:42:21)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/24/09 22:35:46)

Message:

Makefile.am: Fall back gracefully if we can’t compute a GIT_VERSION.

Also, use simply-expanded variables (:=, not =) to shell out, so we
don’t recompute GIT_VERSION again for every object.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• Makefile.am (modified) (1 diff)

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
 
-GIT_FLAGS=$(if $(wildcard .git),-DGIT_VERSION=$(subst barnowl-,,$(shell git describe --match='barnowl-*' HEAD)))
+GIT_DESCRIPTION := $(if $(wildcard .git),$(shell git describe --match='barnowl-*' HEAD 2>/dev/null))
+GIT_FLAGS := $(if $(GIT_DESCRIPTION),-DGIT_VERSION=$(GIT_DESCRIPTION:barnowl-%=%))
 
 bin_PROGRAMS = barnowl.bin