Mercurial > gnulib
changeset 29946:38e0480fbb71
Recognize 'foo_LIBRARIES += libgnu.a'.
* gnulib-tool (func_emit_lib_Makefile_am): Recognize if a
makefile snippet has already specified an installation location,
also using '+='.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> |
|---|---|
| date | Thu, 03 Jul 2008 20:17:33 +0200 |
| parents | 30e31a41c05d |
| children | 76127ff7748f |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jun 27 17:37:40 2008 +0200 +++ b/ChangeLog Thu Jul 03 20:17:33 2008 +0200 @@ -1,3 +1,10 @@ +2008-07-03 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + Recognize 'foo_LIBRARIES += libgnu.a'. + * gnulib-tool (func_emit_lib_Makefile_am): Recognize if a + makefile snippet has already specified an installation location, + also using '+='. + 2008-07-02 Ondřej Vašík <ovasik@redhat.com> getdate.y: factor out common actions
--- a/gnulib-tool Fri Jun 27 17:37:40 2008 +0200 +++ b/gnulib-tool Thu Jul 03 20:17:33 2008 +0200 @@ -1737,7 +1737,7 @@ echo "AM_CPPFLAGS =" fi echo - if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *= *$libname\\.$libext\$" allsnippets.tmp > /dev/null; then + 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. :