diff options
| author |   Bo Ørsted Andresen <zlin@gentoo.org> | 2008-03-06 14:44:13 +0000 |
|---|---|---|
| committer | Bo Ørsted Andresen <zlin@gentoo.org> | 2008-03-06 14:44:13 +0000 |
| commit | 1ffbcd1b04f1a2f43dd96a2dfebefd929beefd1d (patch) | |
| tree | 416c977127d1dc1d1a857c41dbad13246c82f2a4 /eclass/qt4-build.eclass | |
| parent | amd64 stable, bug 204649 (diff) | |
| download | historical-1ffbcd1b04f1a2f43dd96a2dfebefd929beefd1d.tar.gz historical-1ffbcd1b04f1a2f43dd96a2dfebefd929beefd1d.tar.bz2 historical-1ffbcd1b04f1a2f43dd96a2dfebefd929beefd1d.zip | |
Only install qconfig.pri if one of QCONFIG_{ADD,REMOVE} is non-empty (bug #212491).
Diffstat (limited to 'eclass/qt4-build.eclass')
| -rw-r--r-- | eclass/qt4-build.eclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 1b7ffa838ea6..481b56620b6d 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 2007-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.8 2008/03/06 01:23:51 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.9 2008/03/06 14:44:13 zlin Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -165,14 +165,16 @@ QCONFIG_REMOVE="${QCONFIG_REMOVE:-}" QCONFIG_DEFINE="${QCONFIG_DEFINE:-}" install_qconfigs() { - if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} ]]; then - local x + local x + if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then for x in QCONFIG_ADD QCONFIG_REMOVE; do [[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri done insinto ${QTDATADIR}/mkspecs/gentoo doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed" + fi + if [[ -n ${QCONFIG_DEFINE} ]]; then for x in ${QCONFIG_DEFINE}; do echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h done |