From 5f6a9f510e9909b4e50490b3905dd9d2503cfbf4 Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Fri, 16 Jul 2010 14:19:14 -0700
Subject: Fix lua.pc

Fixes #1876
---
 Library/Formula/gpsbabel.rb |  2 +-
 Library/Formula/lua.rb      | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/gpsbabel.rb b/Library/Formula/gpsbabel.rb
index a4050352b..155ed9ea0 100644
--- a/Library/Formula/gpsbabel.rb
+++ b/Library/Formula/gpsbabel.rb
@@ -1,7 +1,7 @@
 require 'formula'
 
 class Gpsbabel <Formula
-  url 'http://www.gpsbabel.org/plan9.php?token=2f5b506e&dl=gpsbabel-1.4.1.tar.gz'
+  url 'http://www.gpsbabel.org/plan9.php?token=2f4fd3fe&dl=gpsbabel-1.4.1.tar.gz'
   homepage 'http://www.gpsbabel.org'
   md5 '512c4acfb12e20102fa5ceacef45a356'
 
diff --git a/Library/Formula/lua.rb b/Library/Formula/lua.rb
index 657e3afa3..3c6f4a5cf 100644
--- a/Library/Formula/lua.rb
+++ b/Library/Formula/lua.rb
@@ -9,6 +9,12 @@ class Lua <Formula
   def skip_clean? path; true; end
 
   def install
+    # Apply patch-level 2
+    cd 'src' do
+      curl "http://www.lua.org/ftp/patch-lua-5.1.4-2", "-O"
+      `patch < patch-lua-5.1.4-2`
+    end
+
     # Use our CC/CFLAGS to compile.
     inreplace 'src/Makefile' do |s|
       s.remove_make_var! 'CC'
@@ -21,13 +27,7 @@ class Lua <Formula
     # Fix paths in the .pc
     inreplace 'etc/lua.pc' do |s|
       s.gsub! "prefix= /usr/local", "prefix=#{HOMEBREW_PREFIX}"
-      s.gsub! "INSTALL_MAN= ${prefix}/man/man1", "INSTALL_MAN= ${man1}"
-    end
-
-    # Apply patch-level 2
-    cd 'src' do
-      curl "http://www.lua.org/ftp/patch-lua-5.1.4-2", "-O"
-      `patch < patch-lua-5.1.4-2`
+      s.gsub! "INSTALL_MAN= ${prefix}/man/man1", "INSTALL_MAN= ${prefix}/share/man/man1"
     end
 
     system "make", "macosx", "INSTALL_TOP=#{prefix}", "INSTALL_MAN=#{man1}"
-- 
cgit v1.2.3