X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/604da3b78777bf69d01d214f203f3be8ee258f67..89de1d4e186c22dac7cb07c8d00de8c7e75a4dbc:/Makefile

diff --git a/Makefile b/Makefile
index 42387c8..91cb097 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,72 @@
 prefix	= $(HOME)
-bindir= $(prefix)/bin
-mandir = $(prefix)/man
-docdir = $(prefix)/share/doc
+bindir	= $(prefix)/bin
+mandir	= $(prefix)/man
+docdir	= $(prefix)/share/doc
 # DESTDIR=
 
-LDLIBS  = -lcurses
+# 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)
+else
+VERSION	= $(shell test -f VERSION && cat VERSION || echo "unknown-version")
+endif
+ifdef DIST_VERSION
+VERSION = $(DIST_VERSION)
+endif
+
+RPM_VERSION = $(subst -,.,$(VERSION))
+
+LDLIBS	= -lcurses
 CFLAGS	= -Wall -O2
 DFLAGS	= -g -DDEBUG -Werror
 PROGS	= tig
-DOCS	= tig.1.html tig.1 tigrc.5.html tigrc.5 \
-	  manual.toc manual.html manual.html-chunked README.html \
+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)
 
-ifneq (,$(wildcard .git))
-VERSION = $(shell git-describe)
-WTDIRTY = $(shell git-diff-index --name-only HEAD 2>/dev/null)
-CFLAGS += '-DVERSION="$(VERSION)$(if $(WTDIRTY),-dirty)"'
-endif
+override CFLAGS += '-DVERSION="$(VERSION)"'
 
 all: $(PROGS)
 all-debug: $(PROGS)
 all-debug: CFLAGS += $(DFLAGS)
-doc: $(DOCS)
+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: doc
+install-doc-man: doc-man
 	mkdir -p $(DESTDIR)$(mandir)/man1 \
-		 $(DESTDIR)$(mandir)/man5 \
-		 $(DESTDIR)$(docdir)/tig
-	for doc in $(DOCS); do \
+		 $(DESTDIR)$(mandir)/man5
+	for doc in $(MANDOC); do \
 		case "$$doc" in \
-		*.1) install $$doc $(DESTDIR)$(mandir)/man1 ;; \
-		*.5) install $$doc $(DESTDIR)$(mandir)/man5 ;; \
-		*.html) install $$doc $(DESTDIR)$(docdir)/tig ;; \
+		*.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 $(HTMLDOC); do \
+		case "$$doc" in \
+		*.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
+	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
@@ -49,8 +74,42 @@ spell-check:
 strip: all
 	strip $(PROGS)
 
-.PHONY: all all-debug doc install install-doc clean spell-check
+dist: 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)
+
+rpm: dist
+	rpmbuild -ta $(TARNAME).tar.gz
 
+# 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: tig.spec.in
+	sed -e 's/@@VERSION@@/$(RPM_VERSION)/g' < $< > $@
+
+tig: tig.c
+
+manual.html: manual.toc
 manual.toc: manual.txt
 	sed -n '/^\[\[/,/\(---\|~~~\)/p' < $< | while read line; do \
 		case "$$line" in \
@@ -60,28 +119,29 @@ manual.toc: manual.txt
 		*)	   ref="$$ref, $$line" ;; \
 		esac; done | sed 's/\[\[\(.*\)\]\]/\1/' > $@
 
-tig: tig.c
-
 README.html: README
 	asciidoc -b xhtml11 -d article -a readme $<
 
+%.pdf : %.xml
+	docbook2pdf $<
+
 %.1.html : %.1.txt
 	asciidoc -b xhtml11 -d manpage $<
 
 %.1.xml : %.1.txt
-	asciidoc -b docbook -d manpage $<
+	asciidoc -b docbook -d manpage -aversion=$(VERSION) $<
 
 %.1 : %.1.xml
-	xmlto man $<
+	xmlto -m manpage.xsl man $<
 
 %.5.html : %.5.txt
 	asciidoc -b xhtml11 -d manpage $<
 
 %.5.xml : %.5.txt
-	asciidoc -b docbook -d manpage $<
+	asciidoc -b docbook -d manpage -aversion=$(VERSION) $<
 
 %.5 : %.5.xml
-	xmlto man $<
+	xmlto -m manpage.xsl man $<
 
 %.html : %.txt
 	asciidoc -b xhtml11 -d article -n $<
@@ -91,12 +151,3 @@ README.html: README
 
 %.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