From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 20 Jun 2007 07:04:00 +0000 (+0200)
Subject: Use $(MAKE) instead of 'make' and 'git *' instead of 'git-*'
X-Git-Tag: tig-0.9~49
X-Git-Url: https://git.distorted.org.uk/~mdw/tig/commitdiff_plain/0e9f95f4aa7f234efd39c46ba4ba4c84151bc015

Use $(MAKE) instead of 'make' and 'git *' instead of 'git-*'
---

diff --git a/Makefile b/Makefile
index 91cb097..1d320d3 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ docdir	= $(prefix)/share/doc
 # to be overwritten by setting DIST_VERSION on the command line.
 ifneq (,$(wildcard .git))
 GITDESC	= $(subst tig-,,$(shell git describe))
-WTDIRTY	= $(if $(shell git-diff-index HEAD 2>/dev/null),-dirty)
+WTDIRTY	= $(if $(shell git diff-index HEAD 2>/dev/null),-dirty)
 VERSION	= $(GITDESC)$(WTDIRTY)
 else
 VERSION	= $(shell test -f VERSION && cat VERSION || echo "unknown-version")
@@ -78,7 +78,7 @@ dist: tig.spec
 	@mkdir -p $(TARNAME) && \
 	cp tig.spec $(TARNAME) && \
 	echo $(VERSION) > $(TARNAME)/VERSION
-	git-archive --format=tar --prefix=$(TARNAME)/ HEAD > $(TARNAME).tar && \
+	git archive --format=tar --prefix=$(TARNAME)/ HEAD > $(TARNAME).tar && \
 	tar rf $(TARNAME).tar $(TARNAME)/tig.spec $(TARNAME)/VERSION && \
 	gzip -f -9 $(TARNAME).tar && \
 	md5sum $(TARNAME).tar.gz > $(TARNAME).tar.gz.md5
@@ -91,14 +91,14 @@ rpm: dist
 release-doc:
 	git checkout release && \
 	git merge master && \
-	make clean doc-man doc-html && \
+	$(MAKE) clean doc-man doc-html && \
 	git add $(MANDOC) $(HTMLDOC) && \
 	git commit -m "Sync docs" && \
 	git checkout master
 
 release-dist: release-doc
 	git checkout release && \
-	make dist && \
+	$(MAKE) dist && \
 	git checkout master
 
 .PHONY: all all-debug doc doc-man doc-html install install-doc \