From: Bruno Haible <bruno@clisp.org>
Date: Sun, 5 Apr 2009 20:42:13 +0000 (+0200)
Subject: Make it easier to distribute gnulib-built libraries.
X-Git-Tag: v0.1~6024
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=0cffecb8942f5b721bce2b5ec3ffddd9d3523d2d;p=gnulib.git

Make it easier to distribute gnulib-built libraries.
---

diff --git a/ChangeLog b/ChangeLog
index 1f5ef9e85..d5cee0f36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-04-05  Bruno Haible  <bruno@clisp.org>
 
+	* gnulib-tool (func_emit_lib_Makefile_am): Don't add the library to
+	noinst_LTLIBRARIES if the Makefile.am in the same directory specifies
+	that it should be installed.
+
+2009-04-05  Bruno Haible  <bruno@clisp.org>
+
 	* gnulib-tool: New option --copy-file.
 	(func_usage): Document it.
 	(func_dest_tmpfilename): Moved out of func_import.
diff --git a/gnulib-tool b/gnulib-tool
index 0b059e124..56f5616ce 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2047,9 +2047,14 @@ func_emit_lib_Makefile_am ()
     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.