More cleanup to the bootstrap script

bk: 504252c7s7Tq0xklEi0uS1omX6YykA

diff --git a/ChangeLog b/ChangeLog
index 49d60859217871d9d452de3c2754698da6fd1d66..6d3c689d06a58b3769bfab7b869196a5547c05b1 100644 (file)
--- 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 c88ada4554569977504e454739bcebdbac70edff..71ecb88d3e4f5de1be241ab6a85bfe0ac3890c31 100755 (executable)
--- 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)