75 lines
2.7 KiB
Plaintext
75 lines
2.7 KiB
Plaintext
$OpenBSD: patch-ltmain_in,v 1.2 2004/08/02 15:43:11 brad Exp $
|
|
--- ltmain.in.orig Thu Apr 1 22:46:15 2004
|
|
+++ ltmain.in Mon Aug 2 11:38:08 2004
|
|
@@ -2151,10 +2151,17 @@ EOF
|
|
absdir="$libdir"
|
|
fi
|
|
else
|
|
- dir="$ladir/$objdir"
|
|
- absdir="$abs_ladir/$objdir"
|
|
- # Remove this search path later
|
|
- notinst_path="$notinst_path $abs_ladir"
|
|
+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
|
|
+ dir="$ladir"
|
|
+ absdir="$abs_ladir"
|
|
+ # Remove this search path later
|
|
+ notinst_path="$notinst_path $abs_ladir"
|
|
+ else
|
|
+ dir="$ladir/$objdir"
|
|
+ absdir="$abs_ladir/$objdir"
|
|
+ # Remove this search path later
|
|
+ notinst_path="$notinst_path $abs_ladir"
|
|
+ fi
|
|
fi # $installed = yes
|
|
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
|
|
|
@@ -2273,7 +2280,6 @@ EOF
|
|
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
|
if test "$installed" = no; then
|
|
notinst_deplibs="$notinst_deplibs $lib"
|
|
- need_relink=yes
|
|
fi
|
|
# This is a shared library
|
|
|
|
@@ -5824,40 +5830,6 @@ relink_command=\"$relink_command\""
|
|
# Exit here if they wanted silent mode.
|
|
test "$show" = : && exit $EXIT_SUCCESS
|
|
|
|
- $echo "----------------------------------------------------------------------"
|
|
- $echo "Libraries have been installed in:"
|
|
- for libdir in $libdirs; do
|
|
- $echo " $libdir"
|
|
- done
|
|
- $echo
|
|
- $echo "If you ever happen to want to link against installed libraries"
|
|
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
|
|
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
|
- $echo "flag during linking and do at least one of the following:"
|
|
- if test -n "$shlibpath_var"; then
|
|
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
|
- $echo " during execution"
|
|
- fi
|
|
- if test -n "$runpath_var"; then
|
|
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
|
- $echo " during linking"
|
|
- fi
|
|
- if test -n "$hardcode_libdir_flag_spec"; then
|
|
- libdir=LIBDIR
|
|
- eval flag=\"$hardcode_libdir_flag_spec\"
|
|
-
|
|
- $echo " - use the \`$flag' linker flag"
|
|
- fi
|
|
- if test -n "$admincmds"; then
|
|
- $echo " - have your system administrator run these commands:$admincmds"
|
|
- fi
|
|
- if test -f /etc/ld.so.conf; then
|
|
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
|
- fi
|
|
- $echo
|
|
- $echo "See any operating system documentation about shared libraries for"
|
|
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
|
- $echo "----------------------------------------------------------------------"
|
|
exit $EXIT_SUCCESS
|
|
;;
|
|
|