From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Tue, 9 Jan 2007 23:17:33 +0000 (+0000)
Subject: Added a check to ensure GAMES_DATADIR and GAMES_PREFIX_OPT aren't the same, and skip... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9da280a5cf8e65640613748bb189d7aa4a1b20a4;p=gentoo.git

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.
---

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:^/::" )