From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 23 Feb 2012 23:16:42 +0000 (-0500)
Subject: Fix the check-scm-rev invocation in several Makefile.am's.
X-Git-Tag: NTP_4_2_7P260~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6182218d4c7933e4fbd037b8acd5c8e12492effb;p=thirdparty%2Fntp.git

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

bk: 4f46c8daDsIvHVv5kc4XdFx_-r88JQ
---

diff --git a/ChangeLog b/ChangeLog
index 6bee498da..c88569f92 100644
--- 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 422197274..a8731ff75 100644
--- 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 8a8bcd021..97e3efad6 100644
--- 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 e0e9c6b88..5ad2a5477 100644
--- 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 51e33ca73..e56685259 100644
--- 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 5ef4af952..b8f1ce9d6 100644
--- 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