From c4b1da618ae6348eb8725cfd83b84bfc57abde2a Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 28 Nov 2005 12:41:41 +0000 Subject: [PATCH] * ltmain.in: Fix typo introduced in dllsearchpath backport. : Undo line breaks in macro arguments. Reported by Charles Wilson . --- ChangeLog | 6 ++++++ ltmain.in | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index dca95f6d6..fa2575a8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-11-28 Ralf Wildenhues + + * ltmain.in: Fix typo introduced in dllsearchpath backport. + : Undo line breaks in macro arguments. + Reported by Charles Wilson . + 2005-11-26 Peter O'Gorman * ltmain.in (link mode): Add missing $LTCFLAGS for a $LTCC. diff --git a/ltmain.in b/ltmain.in index 4929a7ce6..63ecec623 100644 --- a/ltmain.in +++ b/ltmain.in @@ -4303,7 +4303,7 @@ EOF fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` + testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; *) dllsearchpath="$dllsearchpath:$libdir";; @@ -4941,8 +4941,7 @@ check_executable(const char * path) { struct stat st; - DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!" -); + DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); if ((!path) || (!*path)) return 0; @@ -4975,8 +4974,7 @@ find_executable (const char* wrapper) int tmp_len; char* concat_name; - DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : - "NULL!"); + DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); if ((wrapper == NULL) || (*wrapper == '\0')) return NULL; -- 2.47.3