diff --git a/ChangeLog b/ChangeLog index 29474bb..14cadb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-11-09 Jacob Bachmeyer + + * configure.ac: Revert development version branch tagging hook. + * Makefile.am: Likewise. + + These caused failures (reported in PR44462 as a secondary issue) + when a source tree is copied out of a Git directory. + 2020-08-31 Jacob Bachmeyer * doc/runtest.1: Add brief GFDL notice. License notice in the diff --git a/Makefile.am b/Makefile.am index fb75367..bd5b0fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -233,7 +233,3 @@ dejagnu_TEXINFOS = doc/fdl.texi pip-install: pip3 install --upgrade -e $(top_srcdir) - -install-data-hook: - revision=`cd $(srcdir) && git rev-parse --short HEAD` \ - && sed -i -e "s/^set *frame_version.*/set frame_version $(BRANCH)-$${revision}/" $(pkgdatadir)/runtest.exp diff --git a/configure.ac b/configure.ac index 71bff39..40ee6cc 100644 --- a/configure.ac +++ b/configure.ac @@ -59,11 +59,6 @@ then DEJAGNU="/dev/null" 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) +dnl Makefile.am arranges for DEJAGNU to be exported in the environment. AC_OUTPUT([Makefile])