Makefile: Fix conditionals to avoid calling git when no .git is present

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 24612c1d09681c0cbf606244112b0f8df86c1a5b..b338d8b2a2d26640cc781091ee9c22ec77c11c82 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -10,10 +10,14 @@
 # repository), we let git append identification of the actual commit.
 PACKAGE=notmuch
 
+IS_GIT=$(shell if [ -d .git ] ; then echo yes ; else echo no; fi)
+
 VERSION:=$(shell cat version)
 ifneq ($(MAKECMDGOALS),release)
 ifneq ($(MAKECMDGOALS),release-message)
-VERSION:=$(shell if git describe > /dev/null 2>&1; then git describe --match '[0-9.]*'; else cat version; fi)
+ifeq ($(IS_GIT),yes)
+VERSION:=$(shell git describe --match '[0-9.]*')
+endif
 endif
 endif
 
@@ -81,9 +85,9 @@ dist: $(TAR_FILE)
 # version file).
 .PHONY: release
 release: verify-no-dirty-code
+       $(MAKE) VERSION=$(VERSION) verify-newer
        $(MAKE) VERSION=$(VERSION) test
        $(MAKE) VERSION=$(VERSION) $(GPG_FILE)
-       $(MAKE) VERSION=$(VERSION) verify-newer
        scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
        ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
        mkdir -p releases
@@ -126,6 +130,7 @@ release-message:
 
 .PHONY: verify-no-dirty-code
 verify-no-dirty-code: verify-version
+ifeq ($(IS_GIT),yes)
        @printf "Checking that source tree is clean..."
 ifneq ($(shell git ls-files -m),)
        @echo "No"
@@ -139,17 +144,14 @@ ifneq ($(shell git ls-files -m),)
 else
        @echo "Good"
 endif
+endif
 
 .PHONY: verify-version
 verify-version:
        @echo -n "Checking that $(VERSION) consists only of digits and periods..."
        @if echo $(VERSION) | grep -q -v -x '[0-9.]*'; then \
                (echo "No." && \
-                echo "Remember: You need to use:" && \
-                echo "" && \
-                echo " make VERSION=X.Y release" && \
-                echo "" && \
-                echo "to release notmuch." && false); \
+                echo "Please follow the instructions in RELEASING to choose a version" && false) \
         else :; fi
        @echo "Good."
 
@@ -158,7 +160,8 @@ verify-newer:
        @echo -n "Checking that no $(VERSION) release already exists..."
        @ssh $(RELEASE_HOST) test ! -e $(RELEASE_DIR)/$(TAR_FILE) \
                || (echo "Ouch." && echo "Found: $(RELEASE_HOST):$(RELEASE_DIR)/$(TAR_FILE)" \
-               && echo "Refusing to replace an existing release." && false)
+               && echo "Refusing to replace an existing release." \
+               && echo "Don't forget to update \"version\" as described in RELEASING before release." && false)
        @echo "Good."
 
 # The user has not set any verbosity, default to quiet mode and inform the