version -> version.c improvements

bk: 3e9e8264ejeWDfUWdaLM_9uIN8jpWQ

diff --git a/Makefile.am b/Makefile.am
index 8bbe0b837bc4aee8118c40e248c55fe233bc623a..2df68899f42565fddfc1ad6ff15965f3ce6099ae 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,12 +68,13 @@ $(srcdir)/COPYRIGHT: html/copyright.htm
 # repo is not a bk repo, we'll get an error message from the prs command.
 # Unfortunately, I haven't found the necessary magic to redirect this error
 # output to /dev/null under ancient/unique shells like the one Ultrix uses.
-# We'll also get an error of srcdir or version is unwritable.
+# We'll also get an error if srcdir or version is unwritable.
 $(srcdir)/version: FRC.version
        -(bk version) >/dev/null 2>&1 && \
            cd $(srcdir) && \
             x=`bk -R prs -hr+ -nd:I: ChangeSet` && \
-           case "$$x" in '') ;; *) echo $$x > version ;; esac
+           y=`cat version 2>/dev/null` || true && \
+           case "$$x" in ''|$$y) ;; *) echo $$x > version ;; esac
 
 dist-hook:
        @find $(distdir) -type d -name CVS -print | xargs rm -rf

diff --git a/NEWS b/NEWS
index 019c9c3ce5d65823891bc29b3885b05b76622296..4216551b71152c6cbf13bcc6f5e206d33f18a794 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@
 * ntpdc improvements
 * GOES refclock fix
 * JJY driver
+* AIX 5 port
 * bsdi port fixes
 * Cray unicos port upgrade
 * HP MPE/iX port

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 94dfd092a6f27217f9a5509ddf35a2750ff3d910..e0f6236d24287918a2c4a070285eae3c13ca31b4 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -47,6 +47,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@ @LIBRSAREF@ Makefile $(top_srcdir)/version
        env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpd
        $(COMPILE) -c version.c

diff --git a/ntpdate/Makefile.am b/ntpdate/Makefile.am
index f4152b0120b9d4428c55aa7eb99f9a370a4d5cc1..12c4c312cf655b172f6bf8f0316b456dafdebdb8 100644 (file)
--- a/ntpdate/Makefile.am
+++ b/ntpdate/Makefile.am
@@ -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 @LIBRSAREF@ Makefile $(top_srcdir)/version
        env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpdate
        $(COMPILE) -c version.c

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index ba0626f3ad4132fd400a2d65d28b96d4cb91bc11..94b8e9e215d12ba4b98e0c698ca3320c680dad36 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -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 @LIBRSAREF@ Makefile $(top_srcdir)/version
        env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpdc
        $(COMPILE) -c version.c

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 918df9c8ec953071c1e2b8ba025bbc56951bd5f6..1b25de3135b27b686f48318232c064a1cb75a04e 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -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 @LIBRSAREF@ Makefile $(top_srcdir)/version
        env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpq
        $(COMPILE) -c version.c

diff --git a/ntptrace/Makefile.am b/ntptrace/Makefile.am
index fed8321998f7d2e41cdd75fb73e76bef26815868..419c3eb98ea88a1c90a8a02ed473d6c5b6028708 100644 (file)
--- a/ntptrace/Makefile.am
+++ b/ntptrace/Makefile.am
@@ -14,6 +14,6 @@ $(PROGRAMS): $(LDADD)
 ../libntp/libntp.a:
        cd ../libntp && $(MAKE)
 
-version.o: $(ntptrace_OBJECTS) ../libntp/libntp.a Makefile
+version.o: $(ntptrace_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/version
        env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntptrace
        $(COMPILE) -c version.c