From 0fa8d89507183f9ebd1d1a5f57824cefc6cb687a Mon Sep 17 00:00:00 2001 From: Peter O'Gorman Date: Sun, 18 Dec 2005 21:37:20 +0000 Subject: [PATCH] * ltmain.in (link mode): Don't die if -L does not exist. Put in notinst_path though, so it won't end up in the installed .la file. (link mode): Really eliminate all temporary directories. --- ChangeLog | 8 ++++++++ ltmain.in | 11 ++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 185a2eca5..638bbd925 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-12-18 Peter O'Gorman , + Ralf Wildenhues + + * ltmain.in (link mode): Don't die if -L does not + exist. Put in notinst_path though, so it won't end up in the + installed .la file. + (link mode): Really eliminate all temporary directories. + 2005-12-18 Ralf Wildenhues * ltmain.in : diff --git a/ltmain.in b/ltmain.in index 1f2aea6d8..05b0687ca 100644 --- a/ltmain.in +++ b/ltmain.in @@ -1080,6 +1080,7 @@ EOF no_install=no objs= non_pic_objects= + notinst_path= # paths that contain not-installed libtool libraries precious_files_regex= prefer_static_libs=no preload=no @@ -1482,7 +1483,8 @@ EOF absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit $EXIT_FAILURE + absdir="$dir" + notinst_path="$notinst_path $dir" fi dir="$absdir" ;; @@ -2009,7 +2011,6 @@ EOF newlib_search_path= need_relink=no # whether we're linking any uninstalled libtool libraries notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries case $linkmode in lib) passes="conv link" @@ -3373,9 +3374,9 @@ EOF # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` - deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` done if test -n "$xrpath"; then -- 2.47.3