wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

qt, qt5: use opt_prefix with d-bus.

Browse source 
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Mike McQuaid 2013-07-17 15:17:38 -07:00
parent 631a21b2cd
commit 505ed073bc
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Formula/qt.rb
View file

@ -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

9
Formula/qt5.rb
View file

@ -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