From 8558d90596e86e17bd6613c4dbf221351f07c809 Mon Sep 17 00:00:00 2001 From: Mike Gerwitz Date: Wed, 11 Jun 2014 22:19:53 -0400 Subject: [PATCH] Forcing version regen on combine if in git repo This will re-run `autoconf` if it is detected that the user is within the git repository, which will force `configure` to be regenerated; this is necessary, since `configure.ac` contains the version macros. --- Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4d004cf..af12c85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,11 @@ $(path_build): $(MKDIR_P) "$(path_build)" -combine: $(path_combine_output) $(path_build)/browser-test.html +combine: reconf $(path_combine_output) $(path_build)/browser-test.html + +# will force a reconfigure (for version data) if in the git repo +reconf: + test -d .git && autoconf && ./configure # combine all modules into easily redistributable ease.js file (intended for # browser) @@ -155,7 +159,7 @@ ChangeLog: FORCE > $@ # we *only* want this in a distribution, otherwise the version number will # never change! -version: +version: FORCE $(path_tools)/vergen > $@ clean-local: