[Bug 3215] 'make distcheck' fails with newer BK repository format

bk: 583aa4d9LtlDssdvOEHm9ycb7rUIew

diff --git a/ChangeLog b/ChangeLog
index 0cb8c4fb4779b249944c144baf63c35be953e531..2083f38af2e7aa846f635515180eb5e3620d6bf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+---
+* [Bug 3125] 'make distcheck' fails with new BK repo format <perlinger@ntp.org>
+
 ---
 (4.2.8p9) 2016/11/21 Released by Harlan Stenn <stenn@ntp.org>
 (4.2.8p9) 2016/MM/DD Released by Harlan Stenn <stenn@ntp.org>

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 5c30fc27d674ded48962dd17ecf72fd9029b3dc5..facc07b8071bd66099e30eb1095713ac0536561d 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -187,8 +187,7 @@ check-scm-rev: $(srcdir)/scm-rev
        @: do-nothing
 
 $(srcdir)/scm-rev:
-       -test -r $(srcdir)/../SCCS/s.ChangeSet &&               \
-           (bk version) >/dev/null 2>&1 &&                     \
+       -bk root $(srcdir) >/dev/null 2>&1 &&                   \
            cd $(srcdir)/.. &&                                  \
            x=`bk -R prs -hr+ -nd:I: ChangeSet` &&              \
            y=`cat sntp/scm-rev 2>/dev/null` || true &&         \