From d5e8c0dde8fee27189b1c5658bbc6471c807ec79 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 3 Jul 2008 20:17:33 +0200 Subject: [PATCH] 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 --- ChangeLog | 7 +++++++ gnulib-tool | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b5d4f0571..15ef5245d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 --git a/gnulib-tool b/gnulib-tool index 9798eaa19..1c4500286 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -1737,7 +1737,7 @@ func_emit_lib_Makefile_am () 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. : -- 2.11.0