From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 20 Feb 2019 17:44:58 +0000 (-0800)
Subject: build system cleanups
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20e9c96c71e34c40acaf4f0fa7f1b4262d3c3cfd;p=thirdparty%2Fntp.git

build system cleanups

bk: 5c6d921akaEO5KMZp03PxlM-OAbBqQ
---

diff --git a/build b/build
index 15fe39afa..f6dca6b35 100755
--- 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 1524675b4..a968fc4ec 100755
--- 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 f92cd0efa..09aac10bc 100644
--- 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 1c1873574..44825567b 100644
--- 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