diff options
| author | Jack Nagel | 2014-10-26 21:46:40 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-10-26 21:46:40 -0500 |
| commit | f1a53e1e83deb622d0b65908c7401dbd10c099a9 (patch) | |
| tree | 13d9a672f02f5747de3de9ec36e2b2b2714dfb6b /Library/Formula | |
| parent | 3a44ae3843d41a19b01373043adaa90065541a06 (diff) | |
| download | homebrew-f1a53e1e83deb622d0b65908c7401dbd10c099a9.tar.bz2 | |
mkvtoolnix: fix non-/usr/local installs again
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/mkvtoolnix.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Library/Formula/mkvtoolnix.rb b/Library/Formula/mkvtoolnix.rb index 72f3d4929..27e03e80e 100644 --- a/Library/Formula/mkvtoolnix.rb +++ b/Library/Formula/mkvtoolnix.rb @@ -77,6 +77,8 @@ class Mkvtoolnix < Formula ENV["ZLIB_LIBS"] = "-L/usr/lib -lz" boost = Formula["boost"] + ogg = Formula["libogg"] + vorbis = Formula["libvorbis"] args = %W[ --disable-debug @@ -87,10 +89,12 @@ class Mkvtoolnix < Formula if build.with? "wxmac" wxmac = Formula["wxmac"] - - args << "--enable-gui" - args << "--enable-wxwidgets" + args << "--with-extra-includes=#{ogg.opt_include};#{vorbis.opt_include};#{wxmac.opt_include}" + args << "--with-extra-libs=#{ogg.opt_lib};#{vorbis.opt_lib};#{wxmac.opt_lib}" + args << "--enable-gui" << "--enable-wxwidgets" else + args << "--with-extra-includes=#{ogg.opt_include};#{vorbis.opt_include}" + args << "--with-extra-libs=#{ogg.opt_lib};#{vorbis.opt_lib}" args << "--disable-wxwidgets" end |
