diff options
| author | Jack Nagel | 2013-07-13 22:56:45 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-07-13 22:56:45 -0500 |
| commit | f4242e5865a88c5b7cc802b51afc23702b601c86 (patch) | |
| tree | b72eb606e0a92f5b4e0f40ace29096ae14c8772c /Library/Formula/gdal.rb | |
| parent | eb76eb73b8c553c134dbd11511ff3db8ce901d5f (diff) | |
| download | homebrew-f4242e5865a88c5b7cc802b51afc23702b601c86.tar.bz2 | |
Make the use of paths to packages proxied through X11 consistent
Diffstat (limited to 'Library/Formula/gdal.rb')
| -rw-r--r-- | Library/Formula/gdal.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Library/Formula/gdal.rb b/Library/Formula/gdal.rb index b37e0b644..5daf84a59 100644 --- a/Library/Formula/gdal.rb +++ b/Library/Formula/gdal.rb @@ -56,6 +56,10 @@ class Gdal < Formula depends_on "poppler" end + def png_prefix + MacOS.version >= :mountain_lion ? HOMEBREW_PREFIX/"opt/libpng" : MacOS::X11.prefix + end + def get_configure_args args = [ # Base configuration. @@ -76,7 +80,7 @@ class Gdal < Formula # Backends supported by OS X. "--with-libiconv-prefix=/usr", "--with-libz=/usr", - "--with-png=#{(MacOS.version >= :mountain_lion) ? HOMEBREW_PREFIX : MacOS::X11.prefix}", + "--with-png=#{png_prefix}", "--with-expat=/usr", "--with-curl=/usr/bin/curl-config", |