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