geda-gaf: use Formula[]

Also fix other style nits

1 files changed, 13 insertions, 12 deletions

diff --git a/Library/Formula/geda-gaf.rb b/Library/Formula/geda-gaf.rb
index 18a097efc..0e80e9ed9 100644
--- a/Library/Formula/geda-gaf.rb
+++ b/Library/Formula/geda-gaf.rb
@@ -18,20 +18,21 @@ class GedaGaf < Formula
   depends_on :x11
 
   def install
-    # Help configure find libraries
-    gettext = Formula.factory('gettext')
-    pcb = Formula.factory('pcb')
-
-    extra_configure_args = []
-    if !build.devel?
-      extra_configure_args << "--with-pcb-confdir=#{pcb.etc/:pcb}"
+    gettext = Formula['gettext']
+
+    args = [
+      "--prefix=#{prefix}",
+      "--with-gettext=#{gettext.prefix}",
+      "--disable-update-xdg-database",
+      "--with-pcb-datadir=#{HOMEBREW_PREFIX}/share/pcb"
+    ]
+
+    if build.stable?
+      pcb = Formula['pcb']
+      args << "--with-pcb-confdir=#{pcb.etc}/pcb"
     end
-    system "./configure", "--prefix=#{prefix}",
-                          "--with-gettext=#{gettext.prefix}",
-                          "--disable-update-xdg-database",
-                          "--with-pcb-datadir=#{HOMEBREW_PREFIX/:share/:pcb}",
-                          *extra_configure_args
 
+    system "./configure", *args
     system "make"
     system "make install"
   end