qt, qt5: use opt_prefix with d-bus.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>master
parent
631a21b2cd
commit
505ed073bc
|
@ -49,9 +49,10 @@ class Qt < Formula
|
||||||
args << "-plugin-sql-mysql" if build.with? 'mysql'
|
args << "-plugin-sql-mysql" if build.with? 'mysql'
|
||||||
|
|
||||||
if build.with? 'qtdbus'
|
if build.with? 'qtdbus'
|
||||||
args << "-I#{Formula.factory('d-bus').lib}/dbus-1.0/include"
|
dbus_opt = Formula.factory('d-bus').opt_prefix
|
||||||
args << "-I#{Formula.factory('d-bus').include}/dbus-1.0"
|
args << "-I#{dbus_opt}/lib/dbus-1.0/include"
|
||||||
args << "-L#{Formula.factory('d-bus').lib}"
|
args << "-I#{dbus_opt}/include/dbus-1.0"
|
||||||
|
args << "-L#{dbus_opt}/lib"
|
||||||
args << "-ldbus-1"
|
args << "-ldbus-1"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -37,10 +37,11 @@ class Qt5 < Formula
|
||||||
|
|
||||||
args << "-plugin-sql-mysql" if build.with? 'mysql'
|
args << "-plugin-sql-mysql" if build.with? 'mysql'
|
||||||
|
|
||||||
if build.include? 'with-qtdbus'
|
if build.with? 'qtdbus'
|
||||||
args << "-I#{Formula.factory('d-bus').lib}/dbus-1.0/include"
|
dbus_opt = Formula.factory('d-bus').opt_prefix
|
||||||
args << "-I#{Formula.factory('d-bus').include}/dbus-1.0"
|
args << "-I#{dbus_opt}/lib/dbus-1.0/include"
|
||||||
args << "-L#{Formula.factory('d-bus').lib}"
|
args << "-I#{dbus_opt}/include/dbus-1.0"
|
||||||
|
args << "-L#{dbus_opt}/lib"
|
||||||
args << "-ldbus-1"
|
args << "-ldbus-1"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue