From: Juergen Perlinger <perlinger@ntp.org>
Date: Sun, 27 Nov 2016 09:18:17 +0000 (+0100)
Subject: [Bug 3215] 'make distcheck' fails with newer BK repository format
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc8a008ff0d3235c5a2f9dc4b0ff343574b3ca5e;p=thirdparty%2Fntp.git

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

bk: 583aa4d9LtlDssdvOEHm9ycb7rUIew
---

diff --git a/ChangeLog b/ChangeLog
index 0cb8c4fb4..2083f38af 100644
--- 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 5c30fc27d..facc07b80 100644
--- 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 &&		\