From 505ed073bc5ca2af239581a6a9f2d97994b92bbc Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 17 Jul 2013 15:17:38 -0700 Subject: [PATCH] qt, qt5: use opt_prefix with d-bus. Signed-off-by: Mike McQuaid --- Formula/qt.rb | 7 ++++--- Formula/qt5.rb | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Formula/qt.rb b/Formula/qt.rb index 8c708bb2528..ce54d028942 100644 --- a/Formula/qt.rb +++ b/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/Formula/qt5.rb b/Formula/qt5.rb index d4ba55f611d..22a65927683 100644 --- a/Formula/qt5.rb +++ b/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