X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/cf63d30cbc4efb2bb87e52c4e54366751bb958fa..d195d49ebe6e5fcc0e12cc41b78ea42c639ba2ab:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 61fc86b..d5d9695 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")
@@ -20,7 +20,7 @@ endif
 RPM_VERSION = $(subst -,.,$(VERSION))
 
 LDLIBS	= -lcurses
-CFLAGS	= -Wall -O2 '-DVERSION="$(VERSION)"'
+CFLAGS	= -Wall -O2
 DFLAGS	= -g -DDEBUG -Werror
 PROGS	= tig
 MANDOC	= tig.1 tigrc.5
@@ -28,6 +28,8 @@ HTMLDOC = tig.1.html tigrc.5.html manual.html README.html
 ALLDOC	= $(MANDOC) $(HTMLDOC) manual.html-chunked manual.pdf
 TARNAME	= tig-$(RPM_VERSION)
 
+override CFLAGS += '-DVERSION="$(VERSION)"'
+
 all: $(PROGS)
 all-debug: $(PROGS)
 all-debug: CFLAGS += $(DFLAGS)
@@ -76,7 +78,8 @@ 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 | \
+	tar --delete $(TARNAME)/VERSION > $(TARNAME).tar && \
 	tar rf $(TARNAME).tar $(TARNAME)/tig.spec $(TARNAME)/VERSION && \
 	gzip -f -9 $(TARNAME).tar && \
 	md5sum $(TARNAME).tar.gz > $(TARNAME).tar.gz.md5
@@ -89,14 +92,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 \