Try to automatically re-run configure script when appropriate

But, of course, don't try to run it unless we are actually using it! [ jf: Update NEWS ]
tsibley · Sep 30, 2012 · 4500f5b · 4500f5b
1 parent 401d81c
commit 4500f5b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -147,7 +147,9 @@ dist: configure tig.spec
 rpm: dist
 	rpmbuild -ta $(TARNAME).tar.gz
 
-configure: configure.ac acinclude.m4
+# Other autoconf-related rules are hidden in config.make.in so that
+# they don't confuse Make when we aren't actually using ./configure
+configure: configure.ac acinclude.m4 contrib/*.m4
 	./autogen.sh
 
 .PHONY: all all-debug doc doc-man doc-html install install-doc \

diff --git a/NEWS b/NEWS
@@ -40,6 +40,8 @@ Improvements:
    commit IDs in the main view and ID width in the blame view. (GH #77)
  - Allow to override git-based encoding to UTF-8 by setting
    'i18n.commitencoding' or 'gui.encoding'.
+ - Improve autobuild support to track generated files and work with
+   autoreconf 2.61.
 
 Bug fixes:
 

diff --git a/config.make.in b/config.make.in
@@ -19,3 +19,11 @@ XMLTO = @XMLTO@
 DOCBOOK2PDF = @DOCBOOK2PDF@
 
 %.o: config.h
+
+config.status: configure
+	./config.status --recheck
+
+config.h config.make: config.status
+	./config.status $@
+
+config.make: config.make.in