Permalink
Browse files

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 ]
  • Loading branch information...
1 parent 401d81c commit 4500f5b36a8071afde10a67b4d7397567a3e6073 @SamB SamB committed with Sep 7, 2012
Showing with 13 additions and 1 deletion.
  1. +3 −1 Makefile
  2. +2 −0 NEWS
  3. +8 −0 config.make.in
View
@@ -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 \
View
@@ -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:
View
@@ -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

0 comments on commit 4500f5b

Please sign in to comment.