pesa 15/06/13 16:10:09 Modified: ChangeLog qt4-build-multilib.eclass Log: Simplify move of .pc files.
Revision Changes Path 1.1657 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1657&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1657&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1656&r2=1.1657 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1656 retrieving revision 1.1657 diff -u -r1.1656 -r1.1657 --- ChangeLog 13 Jun 2015 00:35:35 -0000 1.1656 +++ ChangeLog 13 Jun 2015 16:10:09 -0000 1.1657 @@ -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 <[email protected]> qt4-build-multilib.eclass: + Simplify move of .pc files. 13 Jun 2015; Ian Stakenvicius (_AxS_) <[email protected]> mozconfig-v4.31.eclass: 1.22 eclass/qt4-build-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.21&r2=1.22 Index: qt4-build-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- qt4-build-multilib.eclass 12 Jun 2015 01:44:17 -0000 1.21 +++ qt4-build-multilib.eclass 13 Jun 2015 16:10:09 -0000 1.22 @@ -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 @@ 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 @@ 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}
