Re: [PATCH, take 5][cygwin|mingw] Control where win32 DLLs get installed.

[Ralf Wildenhues]

[ <http://thread.gmane.org/gmane.comp.gnu.libtool.patches/9412> ]

Hi Dave,

* Dave Korn wrote on Mon, Aug 17, 2009 at 07:25:04AM CEST:
> libtool/ChangeLog:
> 
>       * Makefile.am (TESTSUITE_AT): Add bindir.at.
>       * libltdl/config/general.m4sh (func_normal_abspath): New function.
>       (func_relative_path): Likewise.
>       * libltdl/config/ltmain.m4sh (func_mode_help): Document "-bindir".
>       (func_mode_link): Accept new "-bindir" option and use it, if
>       supplied, to place Windows DLLs.
>       * tests/bindir.at: New file for install tests using "-bindir".
>       * doc/libtool.texi (Link Mode): Update documentation.
> 
>   Built and tested on i686-pc-cygwin and i686-pc-linux-gnu with no regressions
> and all new tests passing.  Ok now?

I've pushed that patch now, adding you to THANKS, removing some trailing
whitespace from your patch, and including the diff below that also has
some fixes found in GCC.

Thanks again,
Ralf

    Control where win32 DLLs get installed.

    * libltdl/config/general.m4sh (func_normal_abspath): New function.
    (func_relative_path): Likewise.
    * libltdl/config/ltmain.m4sh (func_mode_help): Document "-bindir".
    (func_mode_link): Accept new "-bindir" option and use it, if
    supplied, to place Windows DLLs.
    * tests/bindir.at: New file for install tests using "-bindir".
    * Makefile.am (TESTSUITE_AT): Add bindir.at.
    * doc/libtool.texi (Link Mode): Update documentation.
    * NEWS, THANKS: Update.

diff --git a/NEWS b/NEWS
index c7d3016..f96a717 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ New in 2.2.8 2009-??-??: git version 2.2.7a, Libtool team:
   - New convenience make targets `check-noninteractive' to avoid long testsuite
     runs on Windows with popup windows in the middle, and `check-interactive'
     for the complement set of tests.
+  - New link mode flag -bindir to specify the location for installed PE DLLs.
 
 * Changes in supported systems or compilers:
 
diff --git a/libltdl/config/general.m4sh b/libltdl/config/general.m4sh
index c751629..53fafba 100644
--- a/libltdl/config/general.m4sh
+++ b/libltdl/config/general.m4sh
@@ -103,8 +103,8 @@ func_dirname_and_basename ()
 # These SED scripts presuppose an absolute path with a trailing slash.
 pathcar="s,^/\([^/]*\).*$,\1,"
 pathcdr="s,^/[^/]*,,"
-removedotparts="s,/\(\./\)\{1\,\},/,g;s,/\.$,/,"
-collapseslashes="s,/\{1\,\},/,g"
+removedotparts="s@/\(\./\)\{1,\}@/@g;s,/\.$,/,"
+collapseslashes="s@/\{1,\}@/@g"
 finalslash="s,/*$,/,"
 
 # func_normal_abspath PATH
diff --git a/tests/bindir.at b/tests/bindir.at
index c736799..74a7ced 100644
--- a/tests/bindir.at
+++ b/tests/bindir.at
@@ -67,7 +67,7 @@ AT_DATA([simple.c] ,[[
 int main() { return 0;}
 ]])
 
-$CC $CPPFLAGS $CFLAGS -o simple simple.c 2>&1 > /dev/null || noskip=false
+$CC $CPPFLAGS $CFLAGS -o simple simple.c || noskip=false
 rm -f simple
 
 AT_CHECK([$noskip || (exit 77)])