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