Fix exec of scdaemon from gpg-agent

Fixes #21555.

2 files changed, 5 insertions, 4 deletions

diff --git a/Library/Formula/gnupg2.rb b/Library/Formula/gnupg2.rb
index 283190c14..b014dab84 100644
--- a/Library/Formula/gnupg2.rb
+++ b/Library/Formula/gnupg2.rb
@@ -34,11 +34,11 @@ class Gnupg2 < Formula
 
     ENV['gl_cv_absolute_stdint_h'] = "#{MacOS.sdk_path}/usr/include/stdint.h"
 
-    system "./configure", "--prefix=#{prefix}",
-                          "--disable-dependency-tracking",
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
                           "--enable-symcryptrun",
                           "--disable-agent",
-                          "--with-agent-pgm=#{HOMEBREW_PREFIX}/bin/gpg-agent"
+                          "--with-agent-pgm=#{Formula.factory('gpg-agent').opt_prefix}/bin/gpg-agent"
     system "make"
     system "make check"
     system "make install"
diff --git a/Library/Formula/gpg-agent.rb b/Library/Formula/gpg-agent.rb
index 221ebfef2..736fd7bfd 100644
--- a/Library/Formula/gpg-agent.rb
+++ b/Library/Formula/gpg-agent.rb
@@ -23,7 +23,8 @@ class GpgAgent < Formula
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--enable-agent-only",
-                          "--with-pinentry-pgm=#{HOMEBREW_PREFIX}/bin/pinentry"
+                          "--with-pinentry-pgm=#{Formula.factory('pinentry').opt_prefix}/bin/pinentry",
+                          "--with-scdaemon-pgm=#{Formula.factory('gnupg2').opt_prefix}/libexec/scdaemon"
     system "make install"
   end
 end