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

bk: 5cab094emc3_-0X40oJgrpV04f2F3Q

diff --git a/ChangeLog b/ChangeLog
index 77514a0152e34a07b651b0495a6e393ac599e758..352850e3d3bc16f9f31b694c8df0f76aaa8c1312 100644 (file)
--- 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 5c30fc27d674ded48962dd17ecf72fd9029b3dc5..b6ff1f5b003eef8fbf52425c600e4f999788d978 100644 (file)
--- 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