From 0b7e5cd4eb57445f941b1307d3bdb13d01ac90ec Mon Sep 17 00:00:00 2001
From: Max Howell
Date: Fri, 23 Oct 2009 19:22:39 +0100
Subject: Fixes #77

---
 Library/Formula/sdl_image.rb | 6 ------
 Library/Formula/sdl_mixer.rb | 9 ---------
 Library/Formula/sdl_net.rb   | 6 ------
 Library/Formula/sdl_ttf.rb   | 6 ------
 4 files changed, 27 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/sdl_image.rb b/Library/Formula/sdl_image.rb
index dc8a26d5d..3192b7a2c 100644
--- a/Library/Formula/sdl_image.rb
+++ b/Library/Formula/sdl_image.rb
@@ -12,16 +12,10 @@ class SdlImage <Formula
     ENV.x11 # For Freetype
 
     system "./configure", "--prefix=#{prefix}",
-                          "--includedir=#{prefix}/priv_include",
                           "--disable-debug",
                           "--disable-dependency-tracking",
                           "--disable-sdltest",
                           "--with-freetype-exec-prefix=/usr/X11"
     system "make install"
-
-    # Hack alert:
-    # Since SDL is installed as a dependency, we know it exists, so we
-    # symlink our new header file into its brewed location.
-    FileUtils.ln_s "#{prefix}/priv_include/SDL/SDL_image.h", "#{HOMEBREW_PREFIX}/include/SDL"
   end
 end
diff --git a/Library/Formula/sdl_mixer.rb b/Library/Formula/sdl_mixer.rb
index eab4f2057..231baea63 100644
--- a/Library/Formula/sdl_mixer.rb
+++ b/Library/Formula/sdl_mixer.rb
@@ -11,18 +11,9 @@ class SdlMixer <Formula
   #depends_on 'smpeg' => :optional  # http://icculus.org/smpeg/
   
   def install
-    # We use a private include folder, and then
-    # symlink the header file ourselves.
-    # See: http://github.com/mxcl/homebrew/issues#issue/62
     system "./configure", "--prefix=#{prefix}",
-                          "--includedir=#{prefix}/priv_include",
                           "--disable-debug",
                           "--disable-dependency-tracking"
     system "make install"
-
-    # Hack alert:
-    # Since SDL is installed as a dependency, we know it exists, so we
-    # symlink our new header file into its brewed location.
-    FileUtils.ln_s "#{prefix}/priv_include/SDL/SDL_mixer.h", "#{HOMEBREW_PREFIX}/include/SDL"
   end
 end
diff --git a/Library/Formula/sdl_net.rb b/Library/Formula/sdl_net.rb
index c4bc9dc96..ab06e0d65 100644
--- a/Library/Formula/sdl_net.rb
+++ b/Library/Formula/sdl_net.rb
@@ -9,15 +9,9 @@ class SdlNet <Formula
 
   def install
     system "./configure", "--prefix=#{prefix}",
-                          "--includedir=#{prefix}/priv_include",
                           "--disable-debug",
                           "--disable-dependency-tracking",
                           "--disable-sdltest"
     system "make install"
-
-    # Hack alert:
-    # Since SDL is installed as a depency, we know it exists, so we
-    # symlink our new header file into its brewed location.
-    FileUtils.ln_s "#{prefix}/priv_include/SDL/SDL_net.h", "#{HOMEBREW_PREFIX}/include/SDL"
   end
 end
diff --git a/Library/Formula/sdl_ttf.rb b/Library/Formula/sdl_ttf.rb
index 1bce31d0f..771c38c64 100644
--- a/Library/Formula/sdl_ttf.rb
+++ b/Library/Formula/sdl_ttf.rb
@@ -11,16 +11,10 @@ class SdlTtf <Formula
     ENV.x11 # For Freetype
 
     system "./configure", "--prefix=#{prefix}",
-                          "--includedir=#{prefix}/priv_include",
                           "--disable-debug",
                           "--disable-dependency-tracking",
                           "--disable-sdltest",
                           "--with-freetype-exec-prefix=/usr/X11"
     system "make install"
-
-    # Hack alert:
-    # Since SDL is installed as a dependency, we know it exists, so we
-    # symlink our new header file into its brewed location.
-    FileUtils.ln_s "#{prefix}/priv_include/SDL/SDL_ttf.h", "#{HOMEBREW_PREFIX}/include/SDL"
   end
 end
-- 
cgit v1.2.3