Only emit one "Not a git repository" error message

[tig] / Makefile

diff --git a/Makefile b/Makefile
index 0e42de61f0c927ba77db66549828f52c34b7495f..91cb097ed54f261ff38b4cee8215b245f57b4429 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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)
@@ -64,7 +66,7 @@ install-doc: install-doc-man install-doc-html
 clean:
        rm -rf manual.html-chunked $(TARNAME)
        rm -f $(PROGS) $(ALLDOC) core *.xml *.toc
-       rm -f *.spec tig-*.tar.gz
+       rm -f *.spec tig-*.tar.gz tig-*.tar.gz.md5
 
 spell-check:
        aspell --lang=en --check tig.1.txt tigrc.5.txt manual.txt
@@ -73,12 +75,14 @@ strip: all
        strip $(PROGS)
 
 dist: tig.spec
-       git-archive --format=tar --prefix=$(TARNAME)/ HEAD > $(TARNAME).tar
-       @mkdir -p $(TARNAME)
-       @cp tig.spec $(TARNAME)
-       tar rf $(TARNAME).tar $(TARNAME)/tig.spec
+       @mkdir -p $(TARNAME) && \
+       cp tig.spec $(TARNAME) && \
+       echo $(VERSION) > $(TARNAME)/VERSION
+       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
        @rm -rf $(TARNAME)
-       gzip -f -9 $(TARNAME).tar
 
 rpm: dist
        rpmbuild -ta $(TARNAME).tar.gz