4 files changed, 5 insertions, 11 deletions
diff --git a/Library/Formula/rbenv-bundler.rb b/Library/Formula/rbenv-bundler.rb
index b11b3dbb1..42bca67ff 100644
--- a/Library/Formula/rbenv-bundler.rb
+++ b/Library/Formula/rbenv-bundler.rb
@@ -10,8 +10,6 @@ class RbenvBundler < Formula
   def install
     prefix.install Dir['*']
 
-    rbenv_plugins = "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins"
-    mkdir_p rbenv_plugins
-    ln_sf opt_prefix, "#{rbenv_plugins}/#{name}"
+    ln_sf opt_prefix, "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins/#{name}"
   end
 end
diff --git a/Library/Formula/rbenv-gemset.rb b/Library/Formula/rbenv-gemset.rb
index d3de4097e..056afa278 100644
--- a/Library/Formula/rbenv-gemset.rb
+++ b/Library/Formula/rbenv-gemset.rb
@@ -12,8 +12,6 @@ class RbenvGemset < Formula
   def install
     prefix.install Dir['*']
 
-    rbenv_plugins = "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins"
-    mkdir_p rbenv_plugins
-    ln_sf opt_prefix, "#{rbenv_plugins}/#{name}"
+    ln_sf opt_prefix, "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins/#{name}"
   end
 end
diff --git a/Library/Formula/rbenv.rb b/Library/Formula/rbenv.rb
index 8c7a1dd20..1babde0ac 100644
--- a/Library/Formula/rbenv.rb
+++ b/Library/Formula/rbenv.rb
@@ -7,8 +7,6 @@ class Rbenv < Formula
 
   head 'https://github.com/sstephenson/rbenv.git'
 
-  # TODO: When we bump the version here we can remove making the plugin
-  # directory in depending formulae.
   def install
     prefix.install Dir['*']
 
diff --git a/Library/Formula/ruby-build.rb b/Library/Formula/ruby-build.rb
index 57a6b2f55..30dfc7358 100644
--- a/Library/Formula/ruby-build.rb
+++ b/Library/Formula/ruby-build.rb
@@ -15,8 +15,8 @@ class RubyBuild < Formula
     ENV['PREFIX'] = prefix
     system "./install.sh"
 
-    rbenv_plugins = "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins"
-    mkdir_p rbenv_plugins
-    ln_sf opt_prefix, "#{rbenv_plugins}/#{name}" unless build.include? 'without-rbenv'
+    unless build.include? 'without-rbenv'
+      ln_sf opt_prefix, "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins/#{name}"
+    end
   end
 end