AprRequirement's default formula should be apr-util

This matches the recommendation in the message.

1 files changed, 5 insertions, 4 deletions

diff --git a/Library/Homebrew/requirements/apr_dependency.rb b/Library/Homebrew/requirements/apr_dependency.rb
index f996b5b79..f2aab0581 100644
--- a/Library/Homebrew/requirements/apr_dependency.rb
+++ b/Library/Homebrew/requirements/apr_dependency.rb
@@ -2,15 +2,16 @@ require "requirement"
 
 class AprDependency < Requirement
   fatal true
-  default_formula "apr"
+  default_formula "apr-util"
 
   satisfy { MacOS::CLT.installed? || Formula["apr"].installed? }
 
   env do
     unless MacOS::CLT.installed?
-      ENV.prepend_path "PATH", "#{Formula["apr-util"].opt_prefix}/bin"
-      ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr"].opt_prefix}/libexec/lib/pkgconfig"
-      ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr-util"].opt_prefix}/libexec/lib/pkgconfig"
+      ENV.prepend_path "PATH", Formula["apr-util"].opt_bin
+      ENV.prepend_path "PATH", Formula["apr"].opt_bin
+      ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr"].opt_libexec}/lib/pkgconfig"
+      ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["apr-util"].opt_libexec}/lib/pkgconfig"
     end
   end