From 4dc5664af50fdd8f45368b18e476da7c4d6d36fe Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Sat, 2 Aug 2008 18:51:25 +0300 Subject: [PATCH] Put something in version.h for git Make sure include/asterisk/version.h has some actual content if we don't have a .version file and we're in a git repository. --- Makefile | 2 +- build_tools/make_version | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bb4adcb62..e101f33c5 100644 --- a/Makefile +++ b/Makefile @@ -245,7 +245,7 @@ ifneq ($(wildcard .version),) ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version) endif -ifneq ($(wildcard .svn),) +ifneq ($(wildcard .svn)$(wildcard .git),) ASTERISKVERSIONNUM=999999 endif diff --git a/build_tools/make_version b/build_tools/make_version index e55727f40..085783068 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -80,4 +80,7 @@ elif [ -d .svn ]; then else echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}} fi +elif [ -d .git ]; then + # FIXME: anything better? 'git describe' doesn't seem to help. + echo GIT fi -- 2.11.4.GIT