From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 1 Sep 2012 18:24:07 +0000 (-0400)
Subject: More cleanup to the bootstrap script
X-Git-Tag: NTP_4_2_7P299~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b68fa0ad5a7da4ed00bea6873f56726a77dc4b6;p=thirdparty%2Fntp.git

More cleanup to the bootstrap script

bk: 504252c7s7Tq0xklEi0uS1omX6YykA
---

diff --git a/ChangeLog b/ChangeLog
index 49d608592..6d3c689d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* More cleanup to the bootstrap script.
 (4.2.7p298) 2012/09/01 Released by Harlan Stenn <stenn@ntp.org>
 * Handle additional man page sections in the bootstrap script.
 * Remove extraneous parens.
diff --git a/bootstrap b/bootstrap
index c88ada455..71ecb88d3 100755
--- a/bootstrap
+++ b/bootstrap
@@ -84,10 +84,12 @@ prog_opt_files=`grep -l '^prog.name' $def_files`
 
 for f in ${prog_opt_files}
 do
-    f=`echo $f | sed -e 's/-opts.def//'`
+    f=`echo $f | sed -e 's/-opts.def//' -e 's/.def//'`
     l=
     lh=
-    for i in `ls -1 $f*`
+    dfi=`dirname $f`
+    dfi=`echo $dfi | sed -e 's:$:/invoke-*:'`
+    for i in `ls -1 $f* $dfi`
     do
 	case "$i" in
 	 *.c|*.h|*.[1-9]*man|*.[1-9]*mdoc|*.man.in|*.mdoc.in|*.texi|*.menu)