Build: Do not split -rpath in two -Wl options. Pkg-config could incorrectly merge...

diff --git a/ucw/perl/UCW/Configure/C.pm b/ucw/perl/UCW/Configure/C.pm
index e22ac0ed7de90edcb1d713d54c4b84b7dcc3bbd4..4e2b7d5ea499baf649290d321f99b9d4c39748cd 100644 (file)
--- a/ucw/perl/UCW/Configure/C.pm
+++ b/ucw/perl/UCW/Configure/C.pm
@@ -119,9 +119,9 @@ Set("LIBS" => "");
 
 # Extra flags for compiling and linking shared libraries
 Set("CSHARED" => '-fPIC');
-Append("LOPT" => "-Wl,--rpath-link -Wl,run/lib");
+Append("LOPT" => "-Wl,--rpath-link,run/lib");
 if (!(Get("INSTALL_LIB_DIR") eq "/usr/lib")) {
-       Set("SO_LINK_PATH" => "-Wl,--rpath " . Get("INSTALL_LIB_DIR"));
+       Set("SO_LINK_PATH" => "-Wl,--rpath," . Get("INSTALL_LIB_DIR"));
        AtWrite {
                # FIXME: This is a hack. GCC would otherwise fail to link binaries.
                my $libdir = Get("INSTALL_LIB_DIR");