diff options
| author | Mike McQuaid | 2013-07-17 15:17:38 -0700 |
|---|---|---|
| committer | Mike McQuaid | 2013-07-17 17:38:22 -0700 |
| commit | c4d946d967c5284142aefd57b8edbfafddcc2716 (patch) | |
| tree | 80ff30d251b93fcd170de8681f7cc8b3d7cb22c1 /Library | |
| parent | ee496b6e2f6aeb13a4c18730d457c5ef2a73896e (diff) | |
| download | homebrew-c4d946d967c5284142aefd57b8edbfafddcc2716.tar.bz2 | |
qt, qt5: use opt_prefix with d-bus.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/qt.rb | 7 | ||||
| -rw-r--r-- | Library/Formula/qt5.rb | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb index 8c708bb25..ce54d0289 100644 --- a/Library/Formula/qt.rb +++ b/Library/Formula/qt.rb @@ -49,9 +49,10 @@ class Qt < Formula args << "-plugin-sql-mysql" if build.with? 'mysql' if build.with? 'qtdbus' - args << "-I#{Formula.factory('d-bus').lib}/dbus-1.0/include" - args << "-I#{Formula.factory('d-bus').include}/dbus-1.0" - args << "-L#{Formula.factory('d-bus').lib}" + dbus_opt = Formula.factory('d-bus').opt_prefix + args << "-I#{dbus_opt}/lib/dbus-1.0/include" + args << "-I#{dbus_opt}/include/dbus-1.0" + args << "-L#{dbus_opt}/lib" args << "-ldbus-1" end diff --git a/Library/Formula/qt5.rb b/Library/Formula/qt5.rb index d4ba55f61..22a659276 100644 --- a/Library/Formula/qt5.rb +++ b/Library/Formula/qt5.rb @@ -37,10 +37,11 @@ class Qt5 < Formula args << "-plugin-sql-mysql" if build.with? 'mysql' - if build.include? 'with-qtdbus' - args << "-I#{Formula.factory('d-bus').lib}/dbus-1.0/include" - args << "-I#{Formula.factory('d-bus').include}/dbus-1.0" - args << "-L#{Formula.factory('d-bus').lib}" + if build.with? 'qtdbus' + dbus_opt = Formula.factory('d-bus').opt_prefix + args << "-I#{dbus_opt}/lib/dbus-1.0/include" + args << "-I#{dbus_opt}/include/dbus-1.0" + args << "-L#{dbus_opt}/lib" args << "-ldbus-1" end |