Fix exec of scdaemon from gpg-agent

Fixes Homebrew/legacy-homebrew#21555.
Homebrew · Jul 31, 2013 · c1a0e4c · c1a0e4c
1 parent 55dd548
commit c1a0e4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Formula/gnupg2.rb b/Formula/gnupg2.rb
@@ -34,11 +34,11 @@ def install
 
     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/Formula/gpg-agent.rb b/Formula/gpg-agent.rb
@@ -23,7 +23,8 @@ def install
     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