Fix the check-scm-rev invocation in several Makefile.am's.

bk: 4f46c8daDsIvHVv5kc4XdFx_-r88JQ

diff --git a/ChangeLog b/ChangeLog
index 6bee498da60e56f8040e7fbc1398635b7945b26b..c88569f92061a947e0520c7323042a648c4ecc21 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Fix the check-scm-rev invocation in several Makefile.am's.
 (4.2.7p259) 2012/02/22 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2148] ntpd 4.2.7p258 segfault with 0x0100000 bit in NMEA mode.
 * refclock_nmea.c merge cleanup thanks to Juergen Perlinger.

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 422197274b65b27660aec8c48d4dc6bbbe8c6b31..a8731ff75eb493d16a697c97ccaeae03fc4fb6cb 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -305,7 +305,7 @@ check-saveconfig: $(srcdir)/complete.conf compsave.conf
        cd ../libparse && $(MAKE) $(AM_MAKEFLAGS) check-libparse
 
 $(top_srcdir)/sntp/scm-rev:
-       cd $(top_srcdir)/sntp && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev
+       cd ../sntp && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev
 
 version.c: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ Makefile $(top_srcdir)/sntp/scm-rev
        env CSET=`cat $(top_srcdir)/sntp/scm-rev` $(top_builddir)/scripts/mkver ntpd

diff --git a/ntpdate/Makefile.am b/ntpdate/Makefile.am
index 8a8bcd021e6b49c7227e630c70472c5f51201623..97e3efad627e1d3bcb668b79cb0146650fa57e47 100644 (file)
--- a/ntpdate/Makefile.am
+++ b/ntpdate/Makefile.am
@@ -26,7 +26,7 @@ noinst_HEADERS=       ntpdate.h
 $(PROGRAMS): $(LDADD)
 
 $(top_srcdir)/sntp/scm-rev:
-       cd $(top_srcdir)/sntp && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev
+       cd ../sntp && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev
 
 version.c: $(ntpdate_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/sntp/scm-rev
        env CSET=`cat $(top_srcdir)/sntp/scm-rev` $(top_builddir)/scripts/mkver ntpdate

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index e0e9c6b886b0b4975cdf5dc0be9b960686b7b5e9..5ad2a5477f533990d15a36ba30d1adfd1dec5c6e 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -124,7 +124,7 @@ check-layout: ntpdc-layout $(srcdir)/layout.std layout.here
 $(PROGRAMS): version.o
 
 $(top_srcdir)/sntp/scm-rev:
-       cd $(top_srcdir)/sntp && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev
+       cd ../sntp && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev
 
 version.c: $(ntpdc_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/sntp/scm-rev
        env CSET=`cat $(top_srcdir)/sntp/scm-rev` $(top_builddir)/scripts/mkver ntpdc

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 51e33ca73dd968df7babe72aee39273ad595db3f..e566852594f72b5da193dd0ddd217c2ca0ce291f 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -100,7 +100,7 @@ $(srcdir)/ntpq-opts.texi: $(srcdir)/ntpq-opts.def $(std_def_list)
 $(PROGRAMS): version.o
 
 $(top_srcdir)/sntp/scm-rev:
-       cd $(top_srcdir)/sntp && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev
+       cd ../sntp && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev
 
 version.c: $(ntpq_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/sntp/scm-rev
        env CSET=`cat $(top_srcdir)/sntp/scm-rev` $(top_builddir)/scripts/mkver ntpq

diff --git a/util/Makefile.am b/util/Makefile.am
index 5ef4af9524262f009880a0534fed090a0dc6f10d..b8f1ce9d6fce8c505b771c8d5f884e34a1e7af1b 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -107,7 +107,7 @@ kern.o: kern.c
 $(PROGRAMS): version.o
 
 $(top_srcdir)/sntp/scm-rev:
-       cd $(top_srcdir)/sntp && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev
+       cd ../sntp && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev
 
 version.c: $(ntp_keygen_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/sntp/scm-rev
        env CSET=`cat $(top_srcdir)/sntp/scm-rev` $(top_builddir)/scripts/mkver ntp-keygen