# 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")
VERSION = $(DIST_VERSION)
endif
-RPM_VERSION = $(subst -,.,$(VERSION))
+# Split the version "TAG-OFFSET-gSHA1-DIRTY" into "TAG OFFSET"
+# and append 0 as a fallback offset for "exact" tagged versions.
+RPM_VERLIST = $(filter-out g% dirty,$(subst -, ,$(VERSION))) 0
+RPM_VERSION = $(word 1,$(RPM_VERLIST))
+RPM_RELEASE = $(word 2,$(RPM_VERLIST))$(if $(WTDIRTY),.dirty)
LDLIBS = -lcurses
CFLAGS = -Wall -O2
MANDOC = tig.1 tigrc.5
HTMLDOC = tig.1.html tigrc.5.html manual.html README.html
ALLDOC = $(MANDOC) $(HTMLDOC) manual.html-chunked manual.pdf
-TARNAME = tig-$(RPM_VERSION)
+TARNAME = tig-$(RPM_VERSION)-$(RPM_RELEASE)
override CFLAGS += '-DVERSION="$(VERSION)"'
@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
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 \
install-doc-man install-doc-html clean spell-check dist rpm
-tig.spec: tig.spec.in
- sed -e 's/@@VERSION@@/$(RPM_VERSION)/g' < $< > $@
+tig.spec: contrib/tig.spec.in
+ sed -e 's/@@VERSION@@/$(RPM_VERSION)/g' \
+ -e 's/@@RELEASE@@/$(RPM_RELEASE)/g' < $< > $@
tig: tig.c