d657f6
d657f6
- avoid adding %{_libdir} to --link-ld output
d657f6
d657f6
--- apr-1.2.2/apr-config.in.libdir
d657f6
+++ apr-1.2.2/apr-config.in
d657f6
@@ -181,8 +181,10 @@
d657f6
     ;;
d657f6
     --link-ld)
d657f6
     if test "$location" = "installed"; then
d657f6
-        ### avoid using -L if libdir is a "standard" location like /usr/lib
d657f6
-        flags="$flags -L$libdir -l${APR_LIBNAME}"
d657f6
+        if test "$prefix" != "/usr"; then
d657f6
+            flags="$flags -L$libdir"
d657f6
+        fi
d657f6
+        flags="$flags -l${APR_LIBNAME}"
d657f6
     else
d657f6
         ### this surely can't work since the library is in .libs?
d657f6
         flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"