Mercurial > gnulib

changeset 17244:3b0b0f3b01a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint.mk: handle missing git with more grace * top/maint.mk (no-submodule-changes, public-submodule-commit): Quietly proceed if git is not present. Copyright-paperwork-exempt: yes Signed-off-by: Peter Rosin <peda@lysator.liu.se>
author Peter Rosin <peda@lysator.liu.se>
date Fri, 28 Dec 2012 23:13:17 +0100
parents b0688a78cfaf
children 179b150e5256
files ChangeLog top/maint.mk
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Dec 31 11:15:53 2012 -0700
+++ b/ChangeLog	Fri Dec 28 23:13:17 2012 +0100
@@ -1,3 +1,9 @@
+2012-12-31  Peter Rosin  <peda@lysator.liu.se>  (tiny change)
+
+	maint.mk: handle missing git with more grace
+	* top/maint.mk (no-submodule-changes, public-submodule-commit):
+	Quietly proceed if git is not present.
+
 2012-12-31  Eric Blake  <eblake@redhat.com>
 
 	dup2: work around cygwin bug
--- a/top/maint.mk	Mon Dec 31 11:15:53 2012 -0700
+++ b/top/maint.mk	Fri Dec 28 23:13:17 2012 +0100
@@ -1370,7 +1370,8 @@
 
 .PHONY: no-submodule-changes
 no-submodule-changes:
-	$(AM_V_GEN)if test -d $(srcdir)/.git; then			\
+	$(AM_V_GEN)if test -d $(srcdir)/.git				\
+		&& git --version >/dev/null 2>&1; then			\
 	  diff=$$(cd $(srcdir) && git submodule -q foreach		\
 		  git diff-index --name-only HEAD)			\
 	    || exit 1;							\
@@ -1388,7 +1389,8 @@
 # cannot be built from a fresh clone.
 .PHONY: public-submodule-commit
 public-submodule-commit:
-	$(AM_V_GEN)if test -d $(srcdir)/.git; then			\
+	$(AM_V_GEN)if test -d $(srcdir)/.git				\
+		&& git --version >/dev/null 2>&1; then			\
 	  cd $(srcdir) &&						\
 	  git submodule --quiet foreach					\
 	      test '"$$(git rev-parse "$$sha1")"'			\