[PATCH] Makefile.am: allow slashes in git branches

[Jose E. Marchesi]

It is way common for git branches to feature slashes in their names.
This patch modifies a sed invocation in Makefile.am to use a different
command delimiter.

2020-09-02  Jose E. Marchesi  <jose.marchesi@oracle.com>

        * Makefile.am (install-data-hook): Allow git branches with
        slashes in their names.
        * Makefile.in: Regenerate.
---
 ChangeLog   |  6 ++++++
 Makefile.am |  2 +-
 Makefile.in | 14 ++++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29474bb..362d322 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-09-02  Jose E. Marchesi  <jose.marchesi@oracle.com>
+
+       * Makefile.am (install-data-hook): Allow git branches with
+       slashes in their names.
+       * Makefile.in: Regenerate.
+
 2020-08-31  Jacob Bachmeyer  <jcb@gnu.org>
 
        * doc/runtest.1: Add brief GFDL notice.  License notice in the
diff --git a/Makefile.am b/Makefile.am
index fb75367..4c72d65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -236,4 +236,4 @@ pip-install:
 
 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
+       && sed -i -e "s|^set *frame_version.*|set frame_version 
$(BRANCH)-$${revision}|" $(pkgdatadir)/runtest.exp
diff --git a/Makefile.in b/Makefile.in
index e0df0b3..809c4e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -431,8 +431,8 @@ baseboarddir = $(pkgdatadir)/baseboards
 baseboard_DATA = \
        baseboards/README \
        baseboards/aarch64-sim.exp \
-       baseboards/androideabi.exp \
        baseboards/am33_2.0-libremote.exp \
+       baseboards/androideabi.exp \
        baseboards/arm-ice.exp \
        baseboards/arm-sid.exp \
        baseboards/arm-sim.exp \
@@ -447,7 +447,6 @@ baseboard_DATA = \
        baseboards/i386-sid.exp \
        baseboards/iq2000-sim.exp \
        baseboards/jmr3904-sim.exp \
-       baseboards/qemu.exp \
        baseboards/linux-gdbserver.exp \
        baseboards/linux-libremote.exp \
        baseboards/m68k-sid.exp \
@@ -457,13 +456,13 @@ baseboard_DATA = \
        baseboards/mips-lsi-sim.exp \
        baseboards/mips-sim-idt32.exp \
        baseboards/mips-sim-idt64.exp \
-       baseboards/mips-sim.exp \
        baseboards/mips-sim-mti32.exp \
        baseboards/mips-sim-mti64.exp \
-       baseboards/mips-sim-mti64_n32.exp \
        baseboards/mips-sim-mti64_64.exp \
+       baseboards/mips-sim-mti64_n32.exp \
        baseboards/mips-sim-sde32.exp \
        baseboards/mips-sim-sde64.exp \
+       baseboards/mips-sim.exp \
        baseboards/mmixware-sim.exp \
        baseboards/mn10200-sim.exp \
        baseboards/mn10300-sim.exp \
@@ -474,6 +473,7 @@ baseboard_DATA = \
        baseboards/pi.exp \
        baseboards/powerpc-sim.exp \
        baseboards/powerpcle-sim.exp \
+       baseboards/qemu.exp \
        baseboards/riscv-sim.exp \
        baseboards/rx-sim.exp \
        baseboards/sh-sid.exp \
@@ -498,7 +498,8 @@ djlibexec_SCRIPTS = config.guess
 CONTRIB = contrib/compare_tests contrib/sum2junit.sh \
        contrib/mysql/create-db.sql contrib/mysql/importxml.sh \
        contrib/mysql/make-datafile.sh contrib/mysql/plot.sh \
-       contrib/mysql/README contrib/mysql/sum2xml.sh
+       contrib/mysql/README contrib/mysql/sum2xml.sh \
+       contrib/dejagnu.py
 
 
 # Testsuite.
@@ -567,6 +568,7 @@ dist_man_MANS = doc/dejagnu.1 \
        doc/runtest.1
 
 info_TEXINFOS = doc/dejagnu.texi
+dejagnu_TEXINFOS = doc/fdl.texi
 all: all-am
 
 .SUFFIXES:
@@ -1567,7 +1569,7 @@ pip-install:
 
 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
+       && sed -i -e "s|^set *frame_version.*|set frame_version 
$(BRANCH)-$${revision}|" $(pkgdatadir)/runtest.exp
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
-- 
2.25.0.2.g232378479e