1998-12-26 Ben Elliston <bje@cygnus.com>

	* autoreconf.sh (stamp): Add missing quote.
	* mkinstalldirs: Write output which is not diagnostic to standard
	output and not standard error. Suggested by Steve Robbins
	<steve@nyongwa.montreal.qc.ca>.

diff --git a/ChangeLog b/ChangeLog
index a930431142f85d52a0094506fbeb9eb0a3186f10..e48c82b6d2bd8ce704ac4a51f86174f2943cf9db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1998-12-26  Ben Elliston  <bje@cygnus.com>
+
+       * autoreconf.sh (stamp): Add missing quote.
+
+       * mkinstalldirs: Write output which is not diagnostic to standard
+       output and not standard error. Suggested by Steve Robbins
+       <steve@nyongwa.montreal.qc.ca>.
+
 1998-12-11  Ben Elliston  <bje@cygnus.com>
 
        * acgeneral.m4 (AC_ACVERSION): Bump to 2.13.

diff --git a/autoreconf.sh b/autoreconf.sh
index 022e1a5f57f4a04b8c6bca3ac94612b19e398189..99770bbf2f26522638d8498d46896974ad99adfb 100644 (file)
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -127,7 +127,7 @@ while read dir; do
   then
      run_aclocal=yes
   else
-     if test -f `echo $aclocal | sed 's,/[^/]*,,;s,^$,.,'`/acinclude.m4
+     if test -f `echo $aclocal | sed 's,/*[^/]*$,,;s,^$,.,'`/acinclude.m4
      then
        run_aclocal=yes
      fi
@@ -136,14 +136,14 @@ while read dir; do
   then
      if test $force = no &&
         ls -lt configure.in $aclocal \
-              `echo $aclocal | sed 's,/[^/]*,,;s,^$,.,'`/acinclude.m4 |
+              `echo $aclocal | sed 's,/*[^/]*$,,;s,^$,.,'`/acinclude.m4 |
          sed 1q |
           grep 'aclocal\.m4$' > /dev/null
      then
        :
      else
        test $verbose = yes && echo running aclocal in $dir, creating $aclocal
-       aclocal --output=$aclocal -I `echo $aclocal | sed 's,/[^/]*,,;s,^$,.,'`
+       aclocal --output=$aclocal -I `echo $aclocal | sed 's,/*[^/]*$,,;s,^$,.,'`
      fi
   fi
 
@@ -183,12 +183,12 @@ while read dir; do
        : colon
        s/:.*//
       '`
-    stamp=`echo $template | sed 's,/[^/]*$,,;s,^$,.,`/stamp-h`test "$tcount" -gt 1 && echo "$tcount"`.in
+    stamp=`echo $template | sed 's,/*[^/]*$,,;s,^$,.,'`/stamp-h`test "$tcount" -gt 1 && echo "$tcount"`.in
     if test ! -f "$template" || grep autoheader "$template" >/dev/null; then
       if test $force = no && test -f $template &&
         ls -lt $template configure.in $aclocal $stamp 2>/dev/null \
-               `echo $localdir_opt | sed 's/--localdir=//
-                                          s%\(.\)$%\1/%'`acconfig.h |
+               `echo $localdir_opt | sed -e 's/--localdir=//' \
+                                         -e '/./ s%$%/%'`acconfig.h |
           sed 1q | egrep "$template$|$stamp$" > /dev/null
       then
         :

diff --git a/mkinstalldirs b/mkinstalldirs
index d0fd194fd6c74a8fe333eb68698337eef16273fc..6b3b5fc5d4d34f3065bdad528dfeb7604dd01a8d 100755 (executable)
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -22,7 +22,7 @@ do
      esac
 
      if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
+        echo "mkdir $pathcomp"
 
         mkdir "$pathcomp" || lasterr=$?