aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac2
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8817d03..706e39c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2020-05-18 Rob Savoye <rob.savoye@senecass.com>
+
+ * configure.ac: Extract the current branch.
+ * Makefile.am: Change the frame_version in runtest.exp post
+ install to add the branch and git revision to make it easier to
+ support multiple versions during development.
+
2020-05-15 Rob Savoye <rob@senecass.com>
* All files: Minoe change, update copyright dates.
diff --git a/configure.ac b/configure.ac
index 23b38f1..71bff39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,8 @@ fi
AC_SUBST(DEJAGNU)
# See what branch we're in
+# FIXME: this will need to deal with a release branch and
+# do something different
BRANCH=$(cd ${srcdir} && git branch | grep '^\*' | cut -d ' ' -f 2)
AC_SUBST(BRANCH)