diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2007-01-09 23:17:33 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2007-01-09 23:17:33 +0000 |
| commit | 2e3e8e6c074f2bea2ea9cb0124ecc567be23caa8 (patch) | |
| tree | 606c0f5cf861dedaf2cfb56d558fb552db2ab9c8 /eclass | |
| parent | Version bump. (diff) | |
| download | gentoo-2-2e3e8e6c074f2bea2ea9cb0124ecc567be23caa8.tar.gz gentoo-2-2e3e8e6c074f2bea2ea9cb0124ecc567be23caa8.tar.bz2 gentoo-2-2e3e8e6c074f2bea2ea9cb0124ecc567be23caa8.zip | |
Added a check to ensure GAMES_DATADIR and GAMES_PREFIX_OPT aren't the same, and skip all of the symlink-fu if they are. This closes bug #158282.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/games-mods.eclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/games-mods.eclass b/eclass/games-mods.eclass index 4d55b4e0ffc2..b9783715ad27 100644 --- a/eclass/games-mods.eclass +++ b/eclass/games-mods.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/games-mods.eclass,v 1.14 2007/01/01 22:27:01 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/games-mods.eclass,v 1.15 2007/01/09 23:17:33 wolf31o2 Exp $ # Variables to specify in an ebuild which uses this eclass: # GAME - (doom3, quake4 or ut2004, etc), unless ${PN} starts with e.g. "doom3-" @@ -315,7 +315,8 @@ games-mods_src_install() { # be ${GAMES_DATADIR}/${GAME}/${MOD_DIR} in most cases, and symlinking it # into ${GAMES_PREFIX_OPT}/${GAME}/${MOD_DIR} for each game. This should # allow us to support both binary and source-based games easily. - if [[ -d "${GAMES_PREFIX_OPT}"/"${GAME}" ]] + if [[ -d "${GAMES_PREFIX_OPT}"/"${GAME}" ]] && \ + [[ "${GAMES_PREFIX_OPT}" != "${GAMES_DATADIR}" ]] then dodir "${GAMES_PREFIX_OPT}"/"${GAME}" mod=$(echo "${INS_DIR}" | sed -e "s:${GAMES_DATADIR}/${GAME}::" -e "s:^/::" ) |