Mercurial > hg > octave-lojdl > gnulib-hg
changeset 12288:cbae19b6a9f8
gnulib-tool: correctly detect absence of m4 directories
$m4dirs is incorrectly counting. In my particular case
(correct value: 0, detected value: 1), this resulted in gnulib-tool
silently exitting with no visible error (and no job done).
* gnulib-tool: Avoid extra newline on data passed to wc -l.
Signed-off-by: Eric Blake <ebb9@byu.net>
| author | Robert Millan <rmh.grub@aybabtu.com> |
|---|---|
| date | Sat, 14 Nov 2009 06:45:02 -0700 |
| parents | 0c467c7c0132 |
| children | e973be2fb39f |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-11-14 Robert Millan <rmh.grub@aybabtu.com> (tiny change) + + gnulib-tool: correctly detect absence of m4 directories + * gnulib-tool: Avoid extra newline on data passed to wc -l. + 2009-11-14 Jim Meyering <meyering@redhat.com> maint.mk: Prohibit inclusion of "xalloc.h" without use.
--- a/gnulib-tool +++ b/gnulib-tool @@ -4500,7 +4500,7 @@ sedexpr2='s,^[^/]*$,.,' sedexpr3='s,/[^/]*$,,' m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 | sed -e "$sedexpr2" -e "$sedexpr3" | LC_ALL=C sort -u` - m4dirs_count=`echo "$m4dirs" | wc -l` + m4dirs_count=`printf %s "$m4dirs" | wc -l` fi fi if test $m4dirs_count = 0; then