build system cleanups

bk: 5c6d921akaEO5KMZp03PxlM-OAbBqQ

diff --git a/build b/build
index 15fe39afa047ef0e76b9a0a4682fae4040e263d1..f6dca6b350e4978b5882b606f8aedba540cef6a8 100755 (executable)
--- a/build
+++ b/build
@@ -52,7 +52,7 @@ esac
 case "$NTP_BDIR" in
  '')
     case "$IAM" in
-     *.ntp.org)
+     *.ntp.org | *.ntfo.org)
        NTP_BDIR=host
        ;;
      *.udel.edu)

diff --git a/scripts/build/check--help b/scripts/build/check--help
index 1524675b4473f7059d3f357391e832d696e0d160..a968fc4ecabf00040f4edafcf52d54a689f1ab4e 100755 (executable)
--- a/scripts/build/check--help
+++ b/scripts/build/check--help
@@ -10,13 +10,13 @@
 
 if test ! -f $1
 then
-       echo "$0: $1 is not a regular file!" 2>&3
+       echo "$0: $1 is not a regular file!" 1>&2
        exit 1
 fi
 
 if grep -q 'no --help' $1
 then
-       echo "$0: $1 contains 'no --help'!" 2>&3
+       echo "$0: $1 contains 'no --help'!" 1>&2
        mv ${1} ${1}-
        exit 1
 fi

diff --git a/sntp/libopts/autoopts/options.h b/sntp/libopts/autoopts/options.h
index f92cd0efafde663acd03aef72ca1c7045c79cef2..09aac10bce73a9ddad161f61a66e2f4691e06974 100644 (file)
--- a/sntp/libopts/autoopts/options.h
+++ b/sntp/libopts/autoopts/options.h
@@ -109,7 +109,7 @@
  * @{
  */
 /// autoopts structure version
-#define OPTIONS_STRUCT_VERSION      167936
+#define OPTIONS_STRUCT_VERSION      167937
 /// autoopts structure version string
 #define OPTIONS_VERSION_STRING      "41:0:16"
 /// minimum version the autoopts library supports

diff --git a/sntp/libopts/genshell.h b/sntp/libopts/genshell.h
index 1c187357414062f06e89826c4c53533173a3b84e..44825567bc7ff6bc108e31965dab68841c6ffcc6 100644 (file)
--- a/sntp/libopts/genshell.h
+++ b/sntp/libopts/genshell.h
@@ -55,7 +55,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 167936
+#define AO_TEMPLATE_VERSION 167937
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header