Mercurial > gnulib
diff gnulib-tool @ 13632:09362ffa0085
gnulib-tool: Avoid error when run in a package without Makefile.am.
* gnulib-tool: When collecting the m4dirs in a package that does not
have a Makefile.am, eliminate those directories that contain no
gnulib-cache.m4.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 04 Sep 2010 17:38:58 +0200 |
| parents | c2d737898a4e |
| children | 38f90e1a26c2 |
line wrap: on
line diff
--- a/gnulib-tool Sat Sep 04 13:58:02 2010 +0200 +++ b/gnulib-tool Sat Sep 04 17:38:58 2010 +0200 @@ -3313,6 +3313,7 @@ # - modcache true or false, from --cache-modules/--no-cache-modules # - verbose integer, default 0, inc/decremented by --verbose/--quiet # - libname library name +# - supplied_libname true if --lib was given, blank otherwise # - sourcebase directory relative to destdir where to place source code # - m4base directory relative to destdir where to place *.m4 macros # - pobase directory relative to destdir where to place *.po files @@ -5517,6 +5518,7 @@ sedexpr2='s,^[^/]*$,.,' sedexpr3='s,/[^/]*$,,' m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 | sed -e "$sedexpr2" -e "$sedexpr3" | LC_ALL=C sort -u` + m4dirs=`for arg in $m4dirs; do if test -f "$destdir/$arg"/gnulib-cache.m4; then echo $arg; fi; done` m4dirs_count=`printf %s "$m4dirs" | wc -l` fi fi