Consistency between VERSION and github tags.

argonne-lcf · Mar 13, 2024 · fd24889 · fd24889
1 parent 82d8ddd
commit fd24889
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.1.0.0
+v0.1.0
diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,6 @@
 # see semver.org for version info
 m4_define([fallbackversion], m4_normalize(m4_include([VERSION])))
+m4_append([fallbackversion], [.0])
 AC_INIT([cconfigspace],
 	[m4_esyscmd([build-aux/git-version-gen --fallback fallbackversion .tarball-version])],
 	[[email protected]])

diff --git a/m4/ax_dynamic_version.m4 b/m4/ax_dynamic_version.m4
@@ -33,7 +33,7 @@ AC_DEFUN([AX_DYNAMIC_VERSION],[
 [DYNAMIC_VERSION_RULES='
 GITVER = $$(cd $(top_srcdir) 2>/dev/null && sh build-aux/git-version-gen --fallback `cat VERSION` .tarball-version 2>/dev/null)
 OLDVER = $$(cat .version 2>/dev/null)
-CURVER = $$(if [ -z "$(GITVER)" ]; then cat $(top_srcdir)/VERSION | cut -c2- 2>/dev/null; else echo "$(GITVER)"; fi)
+CURVER = $$(if [ -z "$(GITVER)" ]; then echo "\$(cat $(top_srcdir)/VERSION).0" | cut -c2- 2>/dev/null; else echo "$(GITVER)"; fi)
 
 .PHONY: .version
 .version: $(top_srcdir)/VERSION