diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-08-25 14:31:07 +0200 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-08-25 14:31:07 +0200 |
| commit | 7e0c96ad93482db849b855b6c179bb64bcf400dc (patch) | |
| tree | 2e96bee91e3ba020e651784ca6c2d890402d3678 /dev-libs/qjson | |
| parent | dev-qt/qtdeclarative: drop -r0 ebuild, broken on hardened. (diff) | |
| download | gentoo-7e0c96ad93482db849b855b6c179bb64bcf400dc.tar.gz gentoo-7e0c96ad93482db849b855b6c179bb64bcf400dc.tar.bz2 gentoo-7e0c96ad93482db849b855b6c179bb64bcf400dc.zip | |
dev-libs/qjson: use qt4_get_bindir()
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'dev-libs/qjson')
| -rw-r--r-- | dev-libs/qjson/qjson-0.8.1-r1.ebuild | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dev-libs/qjson/qjson-0.8.1-r1.ebuild b/dev-libs/qjson/qjson-0.8.1-r1.ebuild index 71fde4570399..cfbc2b8f4eed 100644 --- a/dev-libs/qjson/qjson-0.8.1-r1.ebuild +++ b/dev-libs/qjson/qjson-0.8.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit cmake-multilib multilib +inherit cmake-multilib multilib qmake-utils DESCRIPTION="A library for mapping JSON data to QVariant objects" HOMEPAGE="http://qjson.sourceforge.net" @@ -24,8 +24,8 @@ DOCS=( ChangeLog README.md ) multilib_src_configure() { local mycmakeargs=( + -DQT_QMAKE_EXECUTABLE="$(qt4_get_bindir)/qmake" $(cmake-utils_use test QJSON_BUILD_TESTS) - -DQT_QMAKE_EXECUTABLE=/usr/$(get_libdir)/qt4/bin/qmake ) cmake-utils_src_configure @@ -33,9 +33,10 @@ multilib_src_configure() { multilib_src_compile() { cmake-utils_src_compile + use doc && if is_final_abi; then - cd "${S}"/doc || die "Failed to move inside doc directory" - doxygen Doxyfile || die "Generating documentation failed" + cd "${S}"/doc || die + doxygen Doxyfile || die fi } |