# HG changeset patch # User Ralf Wildenhues # Date 1215109053 -7200 # Node ID a945eb5a83fea0a6e870e0960b2ff507e4d38f31 # Parent 309ad548f542321851d2efaa911bc8e30557f10b 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 diff -r 309ad548f542 -r a945eb5a83fe ChangeLog --- 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 + + 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 getdate.y: factor out common actions diff -r 309ad548f542 -r a945eb5a83fe gnulib-tool --- 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. :