Include autoconf file for 'make dist'

[tig] / Makefile

diff --git a/Makefile b/Makefile
index da9a743..cee61d8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -81,9 +81,12 @@ install-doc-html: doc-html
 install-doc: install-doc-man install-doc-html
 
 clean:
-       rm -rf manual.html-chunked $(TARNAME)
-       rm -f $(PROGS) $(ALLDOC) core *.o *.xml *.toc
-       rm -f *.spec tig-*.tar.gz tig-*.tar.gz.md5
+       $(RM) -r $(TARNAME) *.spec tig-*.tar.gz tig-*.tar.gz.md5
+       $(RM) $(PROGS) core *.o *.xml
+
+distclean: clean
+       $(RM) -r manual.html-chunked *.toc $(ALLDOC)
+       $(RM) -r autom4te.cache aclocal.m4 config.{h,log,make,status} config.h.in configure
 
 spell-check:
        aspell --lang=en --check tig.1.txt tigrc.5.txt manual.txt
@@ -91,13 +94,13 @@ spell-check:
 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)
@@ -105,15 +108,15 @@ dist: tig.spec
 rpm: dist
        rpmbuild -ta $(TARNAME).tar.gz
 
-configure: configure.ac
+configure: configure.ac acinclude.m4
        $(AUTORECONF) -v
 
 # Maintainer stuff
 release-doc:
        git checkout release && \
        git merge master && \
-       $(MAKE) clean doc-man doc-html && \
-       git add $(MANDOC) $(HTMLDOC) && \
+       $(MAKE) distclean doc-man doc-html && \
+       git add -f $(MANDOC) $(HTMLDOC) && \
        git commit -m "Sync docs" && \
        git checkout master