From: NTP Release Engineering <stenn@ntp.org>
Date: Mon, 8 Apr 2019 08:41:50 +0000 (-0700)
Subject: Clean up sntp/Makefile.am rule for scm-rev
X-Git-Tag: NTP_4_3_95~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c286b9d42600a3cf9041a270b18eda7ade32751d;p=thirdparty%2Fntp.git

Clean up sntp/Makefile.am rule for scm-rev

bk: 5cab094emc3_-0X40oJgrpV04f2F3Q
---

diff --git a/ChangeLog b/ChangeLog
index 77514a015..352850e3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Clean up sntp/Makefile.am rule for scm-rev.  <stenn@ntp.org>
 (4.3.94) 2019/04/07 Released by Harlan Stenn <stenn@ntp.org>
 * Tweak scripts/build/addChangeLogTag <stenn@ntp.org>
 * Pick up tweaks to autogen-5.18.5 <stenn@ntp.org>
diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 5c30fc27d..b6ff1f5b0 100644
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -182,16 +182,15 @@ built-sources-only: $(BUILT_SOURCES)
 
 ## HMS: The next bit is still suboptimal.  We'll get an error if this is
 ## a bk repo and srcdir or scm-rev is unwritable.
+## There may well be other issues, especially around bootstrap.
 
 check-scm-rev: $(srcdir)/scm-rev
 	@: do-nothing
 
 $(srcdir)/scm-rev:
-	-test -r $(srcdir)/../SCCS/s.ChangeSet &&		\
-	    (bk version) >/dev/null 2>&1 &&			\
-	    cd $(srcdir)/.. &&					\
-	    x=`bk -R prs -hr+ -nd:I: ChangeSet` &&		\
-	    y=`cat sntp/scm-rev 2>/dev/null` || true &&		\
+	-cd $(srcdir)/.. &&					\
+	    x=`bk -R prs -hr+ -nd:I: ChangeSet || true` &&	\
+	    y=`cat sntp/scm-rev 2>/dev/null || true` &&		\
 	    case "$$x" in ''|$$y) ;; *) echo $$x > sntp/scm-rev ;; esac
 
 $(srcdir)/m4/version.m4: $(srcdir)/../packageinfo.sh