diff --git a/Makefile b/Makefile
index 6f23166b6a99df2708ed1376c7abcfbf6b546628..6cc4e424e6ef84a3e4c716a25be18cb6db6d86a8 100644 (file)
--- a/Makefile
+++ b/Makefile
prefix ?= $(HOME)
bindir ?= $(prefix)/bin
-mandir ?= $(prefix)/man
datarootdir ?= $(prefix)/share
docdir ?= $(datarootdir)/doc
+mandir ?= $(datarootdir)/man
# DESTDIR=
# Get version either via git or from VERSION file. Allow either
MANDOC = tig.1 tigrc.5
HTMLDOC = tig.1.html tigrc.5.html manual.html README.html
ALLDOC = $(MANDOC) $(HTMLDOC) manual.html-chunked manual.pdf
+
+# Never include the release number in the tarname for tagged
+# versions.
+ifneq ($(if $(DIST_VERSION),$(words $(RPM_VERLIST))),2)
TARNAME = tig-$(RPM_VERSION)-$(RPM_RELEASE)
+else
+TARNAME = tig-$(RPM_VERSION)
+endif
override CFLAGS += '-DTIG_VERSION="$(VERSION)"'
AUTORECONF ?= autoreconf
ASCIIDOC ?= asciidoc
+ASCIIDOC_FLAGS = -aversion=$(VERSION)
XMLTO ?= xmlto
DOCBOOK2PDF ?= docbook2pdf
strip: $(PROGS)
strip $(PROGS)
-dist: tig.spec
+dist: configure tig.spec
@mkdir -p $(TARNAME) && \
- cp tig.spec $(TARNAME) && \
+ cp tig.spec configure config.h.in aclocal.m4 $(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 && \
+ tar rf $(TARNAME).tar `find $(TARNAME)/*` && \
gzip -f -9 $(TARNAME).tar && \
md5sum $(TARNAME).tar.gz > $(TARNAME).tar.gz.md5
@rm -rf $(TARNAME)
*) ref="$$ref, $$line" ;; \
esac; done | sed 's/\[\[\(.*\)\]\]/\1/' > $@
-README.html: README
- $(ASCIIDOC) -b xhtml11 -d article -a readme $<
-
-%.pdf : %.xml
- $(DOCBOOK2PDF) $<
-
-%.1.html : %.1.txt
- $(ASCIIDOC) -b xhtml11 -d manpage $<
+README.html: README asciidoc.conf
+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d article -a readme $<
-%.1.xml : %.1.txt
- $(ASCIIDOC) -b docbook -d manpage -aversion=$(VERSION) $<
+%.1.html : %.1.txt asciidoc.conf
+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d manpage $<
-%.1 : %.1.xml
- $(XMLTO) -m manpage.xsl man $<
+%.1.xml : %.1.txt asciidoc.conf
+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b docbook -d manpage $<
-%.5.html : %.5.txt
- $(ASCIIDOC) -b xhtml11 -d manpage $<
+%.5.html : %.5.txt asciidoc.conf
+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d manpage $<
-%.5.xml : %.5.txt
- $(ASCIIDOC) -b docbook -d manpage -aversion=$(VERSION) $<
+%.5.xml : %.5.txt asciidoc.conf
+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b docbook -d manpage $<
-%.5 : %.5.xml
- $(XMLTO) -m manpage.xsl man $<
+%.html : %.txt asciidoc.conf
+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b xhtml11 -d article -n $<
-%.html : %.txt
- $(ASCIIDOC) -b xhtml11 -d article -n $<
+%.xml : %.txt asciidoc.conf
+ $(ASCIIDOC) $(ASCIIDOC_FLAGS) -b docbook -d article $<
-%.xml : %.txt
- $(ASCIIDOC) -b docbook -d article $<
+% : %.xml
+ $(XMLTO) man $<
%.html-chunked : %.xml
$(XMLTO) html -o $@ $<
+
+%.pdf : %.xml
+ $(DOCBOOK2PDF) $<