diff options
| author | Jack Nagel | 2014-05-19 23:53:12 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-05-19 23:53:12 -0500 |
| commit | 2641349c9c119991c3d7cfe74303beb9876b863e (patch) | |
| tree | 243462ffe9bf318f1d8251ae7dbeb42aa749f07c /Library/Formula/pkg-config.rb | |
| parent | a1a544c70df8dc0b8596892f876ea686bc8059c4 (diff) | |
| download | homebrew-2641349c9c119991c3d7cfe74303beb9876b863e.tar.bz2 | |
pkg-config: remove legacy cflag hack
Diffstat (limited to 'Library/Formula/pkg-config.rb')
| -rw-r--r-- | Library/Formula/pkg-config.rb | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/Library/Formula/pkg-config.rb b/Library/Formula/pkg-config.rb index 1365c6115..af87daaec 100644 --- a/Library/Formula/pkg-config.rb +++ b/Library/Formula/pkg-config.rb @@ -14,27 +14,21 @@ class PkgConfig < Formula end def install - paths = %W[ - #{HOMEBREW_PREFIX}/lib/pkgconfig - #{HOMEBREW_PREFIX}/share/pkgconfig - /usr/local/lib/pkgconfig - /usr/lib/pkgconfig - #{HOMEBREW_LIBRARY}/ENV/pkgconfig/#{MacOS.version} - ].uniq - - args = %W[ - --disable-debug - --prefix=#{prefix} - --disable-host-tool - --with-internal-glib - --with-pc-path=#{paths*':'} - ] - args << "CC=#{ENV.cc} #{ENV.cflags}" unless MacOS::CLT.installed? - - system "./configure", *args + pc_path = %W[ + #{HOMEBREW_PREFIX}/lib/pkgconfig + #{HOMEBREW_PREFIX}/share/pkgconfig + /usr/local/lib/pkgconfig + /usr/lib/pkgconfig + #{HOMEBREW_LIBRARY}/ENV/pkgconfig/#{MacOS.version} + ].uniq.join(File::PATH_SEPARATOR) + system "./configure", "--disable-debug", + "--prefix=#{prefix}", + "--disable-host-tool", + "--with-internal-glib", + "--with-pc-path=#{pc_path}" system "make" - system "make check" - system "make install" + system "make", "check" + system "make", "install" end end |