Permalink
Browse files

qt, qt5: use opt_prefix with d-bus.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
  • Loading branch information...
MikeMcQuaid committed Jul 17, 2013
1 parent 631a21b commit 505ed073bc5ca2af239581a6a9f2d97994b92bbc
Showing with 9 additions and 7 deletions.
  1. +4 −3 Formula/qt.rb
  2. +5 −4 Formula/qt5.rb
View
@@ -49,9 +49,10 @@ def install
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
View
@@ -37,10 +37,11 @@ def install
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

0 comments on commit 505ed07

Please sign in to comment.