Merge

bk: 3bea4021YxVxCe8w9fMlgOOQbxH9wA

diff --cc Makefile.am
Simple merge

diff --cc ntpd/Makefile.am
index a1b689af3c98e92f2ba800b708c872b9ec6ba13a,562c42a2dc4d2e523b00ac9aaf3a799dfb85bbac..0cdddf97db40ff4f5efd32f009fe83c27fa81040
--- 1/ntpd/Makefile.am
--- 2/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 cf781b8d3fc0bb93ebaddc53d80d107182dee8dc,f4152b0120b9d4428c55aa7eb99f9a370a4d5cc1..ee84162c42c6ae82bc47efea349308aef7d22af2
--- 1/ntpdate/Makefile.am
--- 2/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 368d461ff460a5e1f756205c7b48477d83f26689,ba0626f3ad4132fd400a2d65d28b96d4cb91bc11..cb0171898e8e5626046dff260631805aadac9022
--- 1/ntpdc/Makefile.am
--- 2/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 813dc64eb03ee503077e64963e73fba3e3458ced,918df9c8ec953071c1e2b8ba025bbc56951bd5f6..7b0fdd93921cdfa306c4998235aa8cec4ae7bbb4
--- 1/ntpq/Makefile.am
--- 2/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