From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 8 Nov 2001 08:19:45 +0000 (-0500)
Subject: Merge
X-Git-Tag: NTP_4_1_72~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14d66a3ffd38700b3ac5df077a84cd39728921bd;p=thirdparty%2Fntp.git

Merge

bk: 3bea4021YxVxCe8w9fMlgOOQbxH9wA
---

14d66a3ffd38700b3ac5df077a84cd39728921bd
diff --cc ntpd/Makefile.am
index a1b689af3c,562c42a2dc..0cdddf97db
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@@ -45,6 -45,6 +45,6 @@@ $(PROGRAMS): $(LDADD
  ../libparse/libparse.a:
  	cd ../libparse && $(MAKE)
  
 -version.o: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ @LIBRSAREF@ Makefile
 +version.o: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ Makefile
- 	$(top_builddir)/scripts/mkver ntpd
+ 	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpd
  	$(COMPILE) -c version.c
diff --cc ntpdate/Makefile.am
index cf781b8d3f,f4152b0120..ee84162c42
--- a/ntpdate/Makefile.am
+++ b/ntpdate/Makefile.am
@@@ -15,6 -15,6 +15,6 @@@ $(PROGRAMS): $(LDADD
  ../libntp/libntp.a:
  	cd ../libntp && $(MAKE)
  
 -version.o: $(ntpdate_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
 +version.o: $(ntpdate_OBJECTS) ../libntp/libntp.a Makefile
- 	$(top_builddir)/scripts/mkver ntpdate
+ 	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpdate
  	$(COMPILE) -c version.c
diff --cc ntpdc/Makefile.am
index 368d461ff4,ba0626f3ad..cb0171898e
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@@ -16,6 -16,6 +16,6 @@@ $(PROGRAMS): $(LDADD
  ../libntp/libntp.a:
  	cd ../libntp && $(MAKE)
  
 -version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
 +version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a Makefile
- 	$(top_builddir)/scripts/mkver ntpdc
+ 	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpdc
  	$(COMPILE) -c version.c
diff --cc ntpq/Makefile.am
index 813dc64eb0,918df9c8ec..7b0fdd9392
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@@ -16,6 -16,6 +16,6 @@@ $(PROGRAMS): $(LDADD
  ../libntp/libntp.a:
  	cd ../libntp && $(MAKE)
  
 -version.o: $(ntpq_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
 +version.o: $(ntpq_OBJECTS) ../libntp/libntp.a Makefile
- 	$(top_builddir)/scripts/mkver ntpq
+ 	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpq
  	$(COMPILE) -c version.c