projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
09cc2e4
)
Make it possible to install the generated library.
author
Bruno Haible
<bruno@clisp.org>
Mon, 21 Aug 2006 18:49:51 +0000
(18:49 +0000)
committer
Bruno Haible
<bruno@clisp.org>
Mon, 21 Aug 2006 18:49:51 +0000
(18:49 +0000)
ChangeLog
patch
|
blob
|
history
gnulib-tool
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index e3880fffce08bddc637fe148f309f235725d3441..086f0fedc413c875fd8c79388f1df0675204e371 100644
(file)
--- 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.
2006-08-19 Bruno Haible <bruno@clisp.org>
BeOS portability.
diff --git
a/gnulib-tool
b/gnulib-tool
index c45e9886dc8cd4dc688a42f0f44bb4973cc7dbbe..36899447d5915d10b58be140c50eb15ef3d012de 100755
(executable)
--- a/
gnulib-tool
+++ b/
gnulib-tool
@@
-22,7
+22,7
@@
progname=$0
package=gnulib
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'`
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
@@
func_emit_lib_Makefile_am ()
fi
done
) > allsnippets.tmp
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@"
echo
echo "${libname}_${libext}_SOURCES ="
echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@"