From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 3 Jul 2008 18:17:33 +0000 (+0200)
Subject: Recognize 'foo_LIBRARIES += libgnu.a'.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5e8c0dde8fee27189b1c5658bbc6471c807ec79;p=pspp

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>
---

diff --git a/ChangeLog b/ChangeLog
index b5d4f05719..15ef5245d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/gnulib-tool b/gnulib-tool
index 9798eaa19f..1c45002860 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.
     :