1 files changed, 4 insertions, 6 deletions
diff --git a/Library/Formula/spim.rb b/Library/Formula/spim.rb
index d4f5f573b..4f634b73a 100644
--- a/Library/Formula/spim.rb
+++ b/Library/Formula/spim.rb
@@ -11,9 +11,9 @@ class Spim <Formula
     Dir.chdir 'spim'
 
     inreplace "Makefile" do |s|
-      s.change_make_var! "BIN_DIR", "#{prefix}/bin"
-      s.change_make_var! "EXCEPTION_DIR", "#{prefix}/lib"
-      s.change_make_var! "MAN_DIR", "#{prefix}/share/man/man1"
+      s.change_make_var! "BIN_DIR", "#{bin}"
+      s.change_make_var! "EXCEPTION_DIR", "#{libexec}"
+      s.change_make_var! "MAN_DIR", "#{man1}"
     end
 
     system "make"
@@ -21,8 +21,6 @@ class Spim <Formula
     system "make install-man"
     system "make test"
     
-    Dir.chdir "#{prefix}/share/man/man1"
-    mv 'spim.man', 'spim.1'
-    
+    mv "#{man1}/spim.man", "#{man1}/spim.1"
   end
 end