ChangeLog, Makefile.am, Makefile.in:

  * ntpd/Makefile.am (check-local): Use test in favor of [
ChangeLog, check_y2k.c:
  * ntpd/check_y2k.c: Make debug definition match ntpd.h's declaration

bk: 398df4d2URwVEwmMfYy3IzjZyxmzwA

diff --git a/ChangeLog b/ChangeLog
index 437fb90080ecf00348a1c151047d5eeede8bb38d..301fd04dcb308a867435cf239756dad601ac6349 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-06  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * ntpd/check_y2k.c: Make debug definition match ntpd.h's declaration
+
+       * ntpd/Makefile.am (check-local): Use test in favor of [
+
 2000-08-05  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * configure.in (NTP_KEYSDIR): Typo

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 1ebf3a638c5d4511a0c77e12302fb776390fc4bb..3ca2a2398bc5f77f2f9bfc1814e5d805bf5d6ebd 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -18,7 +18,7 @@ check_PROGRAMS = @MAKE_CHECK_Y2K@
 EXTRA_PROGRAMS = check_y2k
 
 check-local: @MAKE_CHECK_Y2K@
-       [ -z "@MAKE_CHECK_Y2K@" ] || ./@MAKE_CHECK_Y2K@
+       test -z "@MAKE_CHECK_Y2K@" || ./@MAKE_CHECK_Y2K@
 
 ntpd_SOURCES = cmd_args.c jupiter.h map_vme.c ntp_config.c ntp_control.c \
        ntp_crypto.c ntp_filegen.c \

diff --git a/ntpd/Makefile.in b/ntpd/Makefile.in
index aa776bd77df60c507b1d0fe576f55bc82cb07d2a..43b9b94a893eeb68d785ff7b4fb014017ea1f7c8 100644 (file)
--- a/ntpd/Makefile.in
+++ b/ntpd/Makefile.in
@@ -631,7 +631,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 check-local: @MAKE_CHECK_Y2K@
-       [ -z "@MAKE_CHECK_Y2K@" ] || ./@MAKE_CHECK_Y2K@
+       test -z "@MAKE_CHECK_Y2K@" || ./@MAKE_CHECK_Y2K@
 
 $(PROGRAMS): $(LDADD)
 

diff --git a/ntpd/check_y2k.c b/ntpd/check_y2k.c
index 49a61f7651e96c566d87ddb98033410d00b7efef..e21006fe90115cdc82ef789050a250bbef7bbc58 100644 (file)
--- a/ntpd/check_y2k.c
+++ b/ntpd/check_y2k.c
@@ -103,7 +103,7 @@
 
 #define GoodLeap(Year) (((Year)%4 || (!((Year)%100) && (Year)%400)) ? 0 : 13 )
 
-int debug = 0;                 /* debugging requests for parse stuff */
+voliatile int debug = 0;       /* debugging requests for parse stuff */
 char const *progname = "check_y2k";
 
 long