diff options
| author | Jack Nagel | 2012-07-25 21:51:20 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-08-01 00:31:39 -0500 |
| commit | ebe8e835716bfd505dec95bdbfbac519f671d783 (patch) | |
| tree | 1a0178bc81825a35259df12cb2185d40eae152d9 /Library/Formula/grass.rb | |
| parent | 68b5fe1ca5a43234fa68a70ec707a77dd6d11cd4 (diff) | |
| download | homebrew-ebe8e835716bfd505dec95bdbfbac519f671d783.tar.bz2 | |
Update formulae for new XQuartz module
Diffstat (limited to 'Library/Formula/grass.rb')
| -rw-r--r-- | Library/Formula/grass.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Formula/grass.rb b/Library/Formula/grass.rb index b1f2f21e5..92fb15cb9 100644 --- a/Library/Formula/grass.rb +++ b/Library/Formula/grass.rb @@ -60,7 +60,7 @@ class Grass < Formula args = [ "--disable-debug", "--disable-dependency-tracking", - "--with-libs=#{MacOS.x11_prefix}/lib #{HOMEBREW_PREFIX}/lib", + "--with-libs=#{MacOS::XQuartz.lib} #{HOMEBREW_PREFIX}/lib", "--with-includes=#{HOMEBREW_PREFIX}/include", "--enable-largefile", "--enable-shared", @@ -74,7 +74,7 @@ class Grass < Formula "--with-sqlite", "--with-odbc", "--with-geos=#{HOMEBREW_PREFIX}/bin/geos-config", - "--with-png-includes=#{MacOS.x11_prefix}/include", + "--with-png-includes=#{MacOS::XQuartz.include}", "--with-png", "--with-readline-includes=#{readline.include}", "--with-readline-libs=#{readline.lib}", @@ -82,7 +82,7 @@ class Grass < Formula "--with-nls-includes=#{gettext.include}", "--with-nls-libs=#{gettext.lib}", "--with-nls", - "--with-freetype-includes=#{MacOS.x11_prefix}/include #{MacOS.x11_prefix}/include/freetype2", + "--with-freetype-includes=#{MacOS::XQuartz.include} #{MacOS::XQuartz.include}/freetype2", "--with-freetype", "--without-tcltk" # Disabled due to compatibility issues with OS X Tcl/Tk ] @@ -106,7 +106,7 @@ class Grass < Formula args << "--with-cairo-includes=#{cairo.include}/cairo" args << "--with-cairo-libs=#{cairo.lib}" else - args << "--with-cairo-includes=#{MacOS.x11_prefix}/include #{MacOS.x11_prefix}/include/cairo" + args << "--with-cairo-includes=#{MacOS::XQuartz.include} #{MacOS::XQuartz.include}/cairo" end args << "--with-cairo" |