diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2012-02-20 10:14:44 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2012-02-20 10:14:44 +0000 |
| commit | 4fe699c5dc3a62ff790f9471de6b210562d4eb96 (patch) | |
| tree | a13a538c593a4866af749dfdc26ac86dd595681a /eclass/gnustep-base.eclass | |
| parent | Restrict pypy for #403791 (diff) | |
| download | gentoo-2-4fe699c5dc3a62ff790f9471de6b210562d4eb96.tar.gz gentoo-2-4fe699c5dc3a62ff790f9471de6b210562d4eb96.tar.bz2 gentoo-2-4fe699c5dc3a62ff790f9471de6b210562d4eb96.zip | |
Use WORKDIR instead of T for temporary GNUstep.conf, fixes bug #389859
Diffstat (limited to 'eclass/gnustep-base.eclass')
| -rw-r--r-- | eclass/gnustep-base.eclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass index 6d4ff9909e69..24382449d977 100644 --- a/eclass/gnustep-base.eclass +++ b/eclass/gnustep-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.23 2012/02/09 16:06:39 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.24 2012/02/20 10:14:44 voyageur Exp $ # @ECLASS: gnustep-base.eclass # @MAINTAINER: @@ -121,11 +121,11 @@ egnustep_env() { source "${GS_MAKEFILES}"/GNUstep.sh # Create compilation GNUstep.conf if it does not exist yet - if [[ ! -f ${T}/GNUstep.conf ]]; then - cp "${EPREFIX}"/etc/GNUstep/GNUstep.conf "${T}" \ + if [[ ! -f ${WORKDIR}/GNUstep.conf ]]; then + cp "${EPREFIX}"/etc/GNUstep/GNUstep.conf "${WORKDIR}" \ || die "GNUstep.conf copy failed" - sed -e "s#\(GNUSTEP_USER_.*DIR.*=\)#\1${T}/#" \ - -i "${T}"/GNUstep.conf || die "GNUstep.conf sed failed" + sed -e "s#\(GNUSTEP_USER_.*DIR.*=\)#\1${WORKDIR}/#" \ + -i "${WORKDIR}"/GNUstep.conf || die "GNUstep.conf sed failed" fi @@ -145,7 +145,7 @@ egnustep_env() { ADDITIONAL_NATIVE_LIB_DIRS="${GNUSTEP_SYSTEM_LIBRARIES}" \ DESTDIR="${D}" \ HOME="${T}" \ - GNUSTEP_CONFIG_FILE="${T}"/GNUstep.conf \ + GNUSTEP_CONFIG_FILE="${WORKDIR}"/GNUstep.conf \ GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \ TAR_OPTIONS="${TAR_OPTIONS} --no-same-owner" \ messages=yes ) |