Mercurial > hg > octave-lojdl > gnulib-hg

changeset 7171:bc1c94eecdb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make it possible to install the generated library.
author Bruno Haible <bruno@clisp.org>
date Mon, 21 Aug 2006 18:49:51 +0000
parents 9030679f62dd
children be9e01d008cb
files ChangeLog gnulib-tool
diffstat 2 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-21  Bruno Haible <bruno@clisp.org>
+
+	* gnulib-tool (func_emit_lib_Makefile_am): If the snippets already
+	specify an installation location, don't emit a noinst_[LT]LIBRARIES
+	assignment.
+
 2006-08-19  Bruno Haible  <bruno@clisp.org>
 
 	BeOS portability.
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-08-21 18:18:25 $'
+cvsdatestamp='$Date: 2006-08-21 18:49:51 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -921,7 +921,14 @@
       fi
     done
   ) > allsnippets.tmp
-  echo "noinst_${perhapsLT}LIBRARIES = $libname.$libext"
+  if grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *= *$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.
+    :
+  else
+    # By default, the generated library should not be installed.
+    echo "noinst_${perhapsLT}LIBRARIES = $libname.$libext"
+  fi
   echo
   echo "${libname}_${libext}_SOURCES ="
   echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@"