Mercurial > gnulib
diff gnulib-tool @ 11463:9b74d1d0b267
Make it easier to distribute gnulib-built libraries.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 05 Apr 2009 22:42:13 +0200 |
| parents | 263b7daa235d |
| children | 618e55f1fba9 |
line wrap: on
line diff
--- a/gnulib-tool Sun Apr 05 21:48:52 2009 +0200 +++ b/gnulib-tool Sun Apr 05 22:42:13 2009 +0200 @@ -2047,9 +2047,14 @@ echo "AM_CFLAGS =" fi echo - if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" allsnippets.tmp > /dev/null; then - # One of the snippets already specifies an installation location for the - # library. Don't confuse automake by saying it should not be installed. + if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" allsnippets.tmp > /dev/null \ + || { test -n "$makefile_name" \ + && test -f "$sourcebase/Makefile.am" \ + && LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" "$sourcebase/Makefile.am" > /dev/null; \ + }; then + # One of the snippets or the user's Makefile.am already specifies an + # installation location for the library. Don't confuse automake by saying + # it should not be installed. : else # By default, the generated library should not be installed.