![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/Makefile b/Makefile
index ad01d12b8da73317cc3424c02bf2c4873ee94924..0ff9e5d03fbba57470b1e8472bb74a536f737832 100644 (file)
--- a/Makefile
+++ b/Makefile
-prefix = $(HOME)
-bindir= $(prefix)/bin
-mandir = $(prefix)/man
-docdir = $(prefix)/share/doc
+## Makefile for tig
+
+all:
+
+# Include setting from the configure script
+-include config.make
+
+prefix ?= $(HOME)
+bindir ?= $(prefix)/bin
+mandir ?= $(prefix)/man
+datarootdir ?= $(prefix)/share
+docdir ?= $(datarootdir)/doc
# DESTDIR=
-# Get version either via git or from VERSION file
+# Get version either via git or from VERSION file. Allow either
+# 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)
-VERSION = $(GITDESC)$(WTDIRTY)
+GITDESC = $(subst tig-,,$(shell git describe))
+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 = $(shell test -f VERSION && cat VERSION || echo "unknown-version")
endif
-RPM_VERSION = $(subst -,.,$(VERSION))
+ifdef DIST_VERSION
+VERSION = $(DIST_VERSION)
+endif
+
+# 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 '-DVERSION="$(VERSION)"'
+LDLIBS ?= -lcurses
+CFLAGS ?= -Wall -O2
DFLAGS = -g -DDEBUG -Werror
PROGS = tig
-DOCS_MAN = tig.1 tigrc.5
-DOCS_HTML = tig.1.html tigrc.5.html \
- manual.html manual.html-chunked \
- README.html
-DOCS = $(DOCS_MAN) $(DOCS_HTML) \
- manual.toc manual.pdf
+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)-$(RPM_RELEASE)
-TARNAME = tig-$(RPM_VERSION)
+override CFLAGS += '-DVERSION="$(VERSION)"'
+
+AUTOHEADER ?= autoheader
+AUTOCONF ?= autoconf
+ASCIIDOC ?= asciidoc
+XMLTO ?= xmlto
+DOCBOOK2PDF ?= docbook2pdf
all: $(PROGS)
all-debug: $(PROGS)
all-debug: CFLAGS += $(DFLAGS)
-doc: $(DOCS)
-doc-man: $(DOCS_MAN)
-doc-html: $(DOCS_HTML)
+doc: $(ALLDOC)
+doc-man: $(MANDOC)
+doc-html: $(HTMLDOC)
install: all
mkdir -p $(DESTDIR)$(bindir) && \
for prog in $(PROGS); do \
- install $$prog $(DESTDIR)$(bindir); \
+ install -p -m 0755 $$prog $(DESTDIR)$(bindir); \
done
install-doc-man: doc-man
mkdir -p $(DESTDIR)$(mandir)/man1 \
$(DESTDIR)$(mandir)/man5
- for doc in $(DOCS); do \
+ for doc in $(MANDOC); do \
case "$$doc" in \
- *.1) install $$doc $(DESTDIR)$(mandir)/man1 ;; \
- *.5) install $$doc $(DESTDIR)$(mandir)/man5 ;; \
+ *.1) install -p -m 0644 $$doc $(DESTDIR)$(mandir)/man1 ;; \
+ *.5) install -p -m 0644 $$doc $(DESTDIR)$(mandir)/man5 ;; \
esac \
done
install-doc-html: doc-html
mkdir -p $(DESTDIR)$(docdir)/tig
- for doc in $(DOCS); do \
+ for doc in $(HTMLDOC); do \
case "$$doc" in \
- *.html) install $$doc $(DESTDIR)$(docdir)/tig ;; \
+ *.html) install -p -m 0644 $$doc $(DESTDIR)$(docdir)/tig ;; \
esac \
done
install-doc: install-doc-man install-doc-html
clean:
- rm -rf manual.html-chunked
- rm -f $(PROGS) $(DOCS) core *.xml
- rm -f *.spec
- rm -rf $(TARNAME)
- rm -f $(TARNAME).tar.gz
+ rm -rf manual.html-chunked $(TARNAME)
+ rm -f $(PROGS) $(ALLDOC) core *.xml *.toc
+ rm -f *.spec tig-*.tar.gz tig-*.tar.gz.md5
spell-check:
aspell --lang=en --check tig.1.txt tigrc.5.txt manual.txt
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 | \
+ 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
@rm -rf $(TARNAME)
- gzip -f -9 $(TARNAME).tar
rpm: dist
rpmbuild -ta $(TARNAME).tar.gz
-.PHONY: all all-debug doc doc-man doc-html install install-doc install-doc-man install-doc-html clean spell-check dist rpm
+configure: configure.ac
+ $(AUTOHEADER)
+ $(AUTOCONF)
-tig.spec: tig.spec.in
- sed -e 's/@@VERSION@@/$(RPM_VERSION)/g' < $< > $@+
- mv $@+ $@
+# Maintainer stuff
+release-doc:
+ git checkout release && \
+ git merge master && \
+ $(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 && \
+ 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: contrib/tig.spec.in
+ sed -e 's/@@VERSION@@/$(RPM_VERSION)/g' \
+ -e 's/@@RELEASE@@/$(RPM_RELEASE)/g' < $< > $@
tig: tig.c
esac; done | sed 's/\[\[\(.*\)\]\]/\1/' > $@
README.html: README
- asciidoc -b xhtml11 -d article -a readme $<
+ $(ASCIIDOC) -b xhtml11 -d article -a readme $<
%.pdf : %.xml
- docbook2pdf $<
+ $(DOCBOOK2PDF) $<
%.1.html : %.1.txt
- asciidoc -b xhtml11 -d manpage $<
+ $(ASCIIDOC) -b xhtml11 -d manpage $<
%.1.xml : %.1.txt
- asciidoc -b docbook -d manpage -aversion=$(VERSION) $<
+ $(ASCIIDOC) -b docbook -d manpage -aversion=$(VERSION) $<
%.1 : %.1.xml
- xmlto -m manpage.xsl man $<
+ $(XMLTO) -m manpage.xsl man $<
%.5.html : %.5.txt
- asciidoc -b xhtml11 -d manpage $<
+ $(ASCIIDOC) -b xhtml11 -d manpage $<
%.5.xml : %.5.txt
- asciidoc -b docbook -d manpage -aversion=$(VERSION) $<
+ $(ASCIIDOC) -b docbook -d manpage -aversion=$(VERSION) $<
%.5 : %.5.xml
- xmlto -m manpage.xsl man $<
+ $(XMLTO) -m manpage.xsl man $<
%.html : %.txt
- asciidoc -b xhtml11 -d article -n $<
+ $(ASCIIDOC) -b xhtml11 -d article -n $<
%.xml : %.txt
- asciidoc -b docbook -d article $<
+ $(ASCIIDOC) -b docbook -d article $<
%.html-chunked : %.xml
- xmlto html -o $@ $<
-
-# Maintainer stuff
-sync-docs:
- cg switch release
- -cg merge -n master
- cg commit -m "Merge with master"
- make doc
- cg commit -m "Sync docs"
- cg switch master
+ $(XMLTO) html -o $@ $<