diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-06-13 16:10:09 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-06-13 16:10:09 +0000 |
| commit | 52a61df5dbd99bff7c0ad3665b00a8a0bebeec71 (patch) | |
| tree | d4be64d4ad54450c14214ff63b7ad07f63f344dd /eclass | |
| parent | remove version 0.2.4 (diff) | |
| download | gentoo-2-52a61df5dbd99bff7c0ad3665b00a8a0bebeec71.tar.gz gentoo-2-52a61df5dbd99bff7c0ad3665b00a8a0bebeec71.tar.bz2 gentoo-2-52a61df5dbd99bff7c0ad3665b00a8a0bebeec71.zip | |
Simplify move of .pc files.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build-multilib.eclass | 17 |
2 files changed, 10 insertions, 12 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 82b91c551ec0..9073daed7274 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1656 2015/06/13 00:35:35 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1657 2015/06/13 16:10:09 pesa Exp $ + + 13 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass: + Simplify move of .pc files. 13 Jun 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org> mozconfig-v4.31.eclass: diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index fe8f0d43c9d6..94b3794dc6a6 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.21 2015/06/12 01:44:17 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.22 2015/06/13 16:10:09 pesa Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -462,15 +462,10 @@ qt4_multilib_src_install() { fi fi - # move pkgconfig files to the correct location - eshopts_push -s nullglob - local pcfile - for pcfile in "${D}/${QT4_LIBDIR}"/pkgconfig/*.pc; do - dodir /usr/$(get_libdir)/pkgconfig - mv "${pcfile}" "${ED}"/usr/$(get_libdir)/pkgconfig || die - done - eshopts_pop - rmdir "${D}/${QT4_LIBDIR}"/pkgconfig + # move pkgconfig directory to the correct location + if [[ -d ${D}${QT4_LIBDIR}/pkgconfig ]]; then + mv "${D}${QT4_LIBDIR}"/pkgconfig "${ED}usr/$(get_libdir)" || die + fi qt4_install_module_qconfigs qt4_symlink_framework_headers @@ -754,7 +749,7 @@ qt4_symlink_framework_headers() { dosym "${rdir}"/${f}/Headers "${dest}" # Link normal headers as well. - for hdr in "${D}/${QT4_LIBDIR}/${f}"/Headers/*; do + for hdr in "${D}${QT4_LIBDIR}/${f}"/Headers/*; do h=$(basename ${hdr}) dosym "../${rdir}"/${f}/Headers/${h} \ "${QT4_HEADERDIR#${EPREFIX}}"/Qt/${h} |