Update formulae to use path shortcuts

15 files changed, 28 insertions, 36 deletions

diff --git a/Library/Formula/binutils.rb b/Library/Formula/binutils.rb
index a03bed3ea..6facadd41 100644
--- a/Library/Formula/binutils.rb
+++ b/Library/Formula/binutils.rb
@@ -10,12 +10,12 @@ class Binutils <Formula
   end
 
   def install
-    ENV.append 'CPPFLAGS', "-I#{prefix}/include"
+    ENV.append 'CPPFLAGS', "-I#{include}"
 
     args = ["--prefix=#{prefix}",
             "--disable-debug",
             "--disable-dependency-tracking",
-            "--infodir=#{prefix}/share/info",
+            "--infodir=#{info}",
             "--mandir=#{man}",
             "--disable-werror" ]
     args << "--program-prefix=g" unless ARGV.include? '--default-names'
diff --git a/Library/Formula/calcurse.rb b/Library/Formula/calcurse.rb
index 50a1a2459..362404aca 100644
--- a/Library/Formula/calcurse.rb
+++ b/Library/Formula/calcurse.rb
@@ -12,7 +12,7 @@ class Calcurse <Formula
   end
 
   def install
-    ENV.append 'CFLAGS', "-I#{prefix}/include -fnested-functions"
+    ENV.append 'CFLAGS', "-I#{include} -fnested-functions"
     ENV.append 'LDFLAGS', "-lintl"
     ENV.O3
     system "./configure", "--disable-dependency-tracking",
diff --git a/Library/Formula/couchdb-lucene.rb b/Library/Formula/couchdb-lucene.rb
index fddfaaa89..d2343fa9e 100644
--- a/Library/Formula/couchdb-lucene.rb
+++ b/Library/Formula/couchdb-lucene.rb
@@ -28,7 +28,7 @@ You can enable couchdb-lucene to automatically load on login with:
   sudo launchctl load -w /Library/LaunchDaemons/couchdb-lucene.plist
 
 Or start it manually with:
-  #{prefix}/bin/run
+  #{bin}/run
 EOS
   end
 
@@ -63,7 +63,7 @@ EOS
     </dict>
     <key>ProgramArguments</key>
     <array>
-      <string>#{prefix}/bin/run</string>
+      <string>#{bin}/run</string>
     </array>
     <key>UserName</key>
     <string>#{`whoami`.chomp}</string>
diff --git a/Library/Formula/d-bus.rb b/Library/Formula/d-bus.rb
index 6f071deb2..1e34aff25 100755
--- a/Library/Formula/d-bus.rb
+++ b/Library/Formula/d-bus.rb
@@ -21,7 +21,6 @@ class DBus <Formula
     system "make install"
 
     # Generate D-Bus's UUID for this machine
-    system "#{prefix}/bin/dbus-uuidgen",
-           "--ensure=#{prefix}/var/lib/dbus/machine-id"
+    system "#{bin}/dbus-uuidgen", "--ensure=#{prefix}/var/lib/dbus/machine-id"
   end
 end
diff --git a/Library/Formula/dmd.rb b/Library/Formula/dmd.rb
index e11017535..ee1a67edf 100644
--- a/Library/Formula/dmd.rb
+++ b/Library/Formula/dmd.rb
@@ -26,11 +26,11 @@ class Dmd <Formula
 
     (prefix+'src/dmd').rmtree # we don't need the dmd sources thanks
     man5.install man1+'dmd.conf.5' # oops
-    (prefix+'share/d/examples').install Dir['samples/d/*.d']
+    (share+'d/examples').install Dir['samples/d/*.d']
 
-    (prefix+'bin/dmd.conf').open('w') do |f|
+    (bin+'dmd.conf').open('w') do |f|
       f.puts "[Environment]"
-      f.puts "DFLAGS=-I#{prefix}/src/phobos -L-L#{prefix}/lib"
+      f.puts "DFLAGS=-I#{prefix}/src/phobos -L#{lib}"
     end
   end
 end
\ No newline at end of file
diff --git a/Library/Formula/ettercap-ng.rb b/Library/Formula/ettercap-ng.rb
index 5755cc7bd..d2fda4ea1 100644
--- a/Library/Formula/ettercap-ng.rb
+++ b/Library/Formula/ettercap-ng.rb
@@ -33,7 +33,7 @@ class EttercapNg < Formula
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--mandir=#{man}",
-                          "--infodir=#{prefix}/share/info",
+                          "--infodir=#{info}",
                           "--disable-gtk",
                           "--disable-plugins",
                           "--with-openssl=/usr",
diff --git a/Library/Formula/falcon.rb b/Library/Formula/falcon.rb
index 11577e7f7..50dc69cdf 100644
--- a/Library/Formula/falcon.rb
+++ b/Library/Formula/falcon.rb
@@ -22,7 +22,7 @@ class Falcon <Formula
   depends_on 'pcre'
 
   def install
-    cmake_opts = "-DCMAKE_INSTALL_NAME_DIR=#{prefix}/lib"
+    cmake_opts = "-DCMAKE_INSTALL_NAME_DIR=#{lib}"
     ENV.append "EXTRA_CMAKE", cmake_opts
     system "./build.sh", "-p", "#{prefix}", "-int", "-el"
     system "./build.sh", "-i"
diff --git a/Library/Formula/fftw.rb b/Library/Formula/fftw.rb
index ac66b73ef..6d8dd83f1 100644
--- a/Library/Formula/fftw.rb
+++ b/Library/Formula/fftw.rb
@@ -27,9 +27,7 @@ class Fftw <Formula
 
     # double precision
     # enable-sse2 only works with double precision (default)
-    system "./configure", "--enable-sse2",
-                          *args
-
+    system "./configure", "--enable-sse2", *args
     system "make install"
 
     # clean up so we can compile the long-double precision variant
@@ -37,12 +35,10 @@ class Fftw <Formula
 
     # long-double precision
     # no SIMD optimization available
-    system "./configure", "--enable-long-double",
-                          *args
-
+    system "./configure", "--enable-long-double", *args
     system "make install"
 
     #wtf file?
-    (prefix+'share/info/dir').unlink
+    (info+'dir').unlink
   end
 end
diff --git a/Library/Formula/ghostscript.rb b/Library/Formula/ghostscript.rb
index 03e539b49..2424c69c2 100755
--- a/Library/Formula/ghostscript.rb
+++ b/Library/Formula/ghostscript.rb
@@ -46,7 +46,7 @@ class Ghostscript <Formula
 
     GhostscriptFonts.new.brew do
       Dir.chdir '..'
-      (prefix+'share/ghostscript').install 'fonts'
+      (share+'ghostscript').install 'fonts'
     end
 
     (man+'de').rmtree
diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb
index 66418ef0b..4c5071ad4 100644
--- a/Library/Formula/glib.rb
+++ b/Library/Formula/glib.rb
@@ -58,6 +58,6 @@ class Glib <Formula
               "Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I#{gettext.include}"
     end
 
-    (prefix+'share/gtk-doc').rmtree
+    (share+'gtk-doc').rmtree
   end
 end
diff --git a/Library/Formula/htop.rb b/Library/Formula/htop.rb
index 75af28bc8..0091b0ec4 100644
--- a/Library/Formula/htop.rb
+++ b/Library/Formula/htop.rb
@@ -6,21 +6,19 @@ class Htop <Formula
 
   def install
     system "./autogen.sh"
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
     system "make", "install", "DEFAULT_INCLUDES='-iquote .'"
     rm_rf "#{share}/applications" # Don't need Gnome support on OS X
     rm_rf "#{share}/pixmaps"
   end
 
   def caveats; <<-EOS
-In order for htop to display correctly all the running processes, it needs to be ran as root.
-
-However, if you do not want to type `sudo htop` every time, you can change the owner and permissions for the executable binary:
-
-$ cd #{prefix}/bin/
-$ chmod 6555 htop
-$ sudo chown root htop
+For htop to display correctly all running processes, it needs to run as root.
+If you don't want to `sudo htop` every time, change the owner and permissions:
+  $ cd #{bin}
+  $ chmod 6555 htop
+  $ sudo chown root htop
     EOS
   end
-
 end
diff --git a/Library/Formula/jsdoc-toolkit.rb b/Library/Formula/jsdoc-toolkit.rb
index 87fad056d..f18c24d54 100644
--- a/Library/Formula/jsdoc-toolkit.rb
+++ b/Library/Formula/jsdoc-toolkit.rb
@@ -6,7 +6,7 @@ class JsdocToolkit <Formula
   sha1 'd8c3977cee202c06a9d6a85b2b9b068d21309fad'
 
   def install
-    system "/bin/echo '#!/bin/ksh\nJSDOCDIR=\"#{prefix}/libexec/jsdoc-toolkit\"' > jsdoc"
+    system "/bin/echo '#!/bin/ksh\nJSDOCDIR=\"#{libexec}/jsdoc-toolkit\"' > jsdoc"
     system "/usr/bin/grep -v \"^echo \\$CMD$\" jsdoc-toolkit/jsrun.sh >> jsdoc"
 
     bin.install 'jsdoc'
diff --git a/Library/Formula/metalua.rb b/Library/Formula/metalua.rb
index 3c61c853c..b69b463ef 100644
--- a/Library/Formula/metalua.rb
+++ b/Library/Formula/metalua.rb
@@ -10,8 +10,8 @@ class Metalua <Formula
 
   def install
     Dir.chdir "src"
-    ENV["INSTALL_BIN"] = "#{prefix}/bin"
-    ENV["INSTALL_LIB"] = "#{prefix}/lib"
+    ENV["INSTALL_BIN"] = bin
+    ENV["INSTALL_LIB"] = lib
 
     system "./make.sh"
     system "./make-install.sh"
diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb
index df54541e3..d48c8adf5 100644
--- a/Library/Formula/mysql.rb
+++ b/Library/Formula/mysql.rb
@@ -80,7 +80,7 @@ class Mysql <Formula
         plist with a version specific program argument.
 
     Or start manually with:
-        #{prefix}/share/mysql/mysql.server start
+        mysql.server start
     EOS
   end
 
diff --git a/Library/Formula/ut-cache.rb b/Library/Formula/ut-cache.rb
index fe20bdd73..f70d41b69 100644
--- a/Library/Formula/ut-cache.rb
+++ b/Library/Formula/ut-cache.rb
@@ -10,10 +10,9 @@ class UtCache <Formula
 
   def install
     system "curl -o getdelim.c http://gist.github.com/raw/278167/26eae93b355d443693c1e8922a328d4a61b4a176/getdelim.c"
-
+    bin.mkpath
     ENV['HOME'] = prefix
     system "make"
-    system "mkdir #{prefix}/bin"
     system "make install"
   end
 end