From 49d8b5dc468a582bbbfb3997cc0ccd9beeb437d5 Mon Sep 17 00:00:00 2001
From: Dave Murphy <davem@devkitpro.org>
Date: Wed, 6 Jun 2018 03:00:46 +0100
Subject: [PATCH] use right prefix for tools

---
 build-devkit.sh                   | 2 ++
 dka64/scripts/build-tools.sh      | 2 +-
 dkarm-eabi/scripts/build-tools.sh | 2 +-
 dkppc/scripts/build-tools.sh      | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build-devkit.sh b/build-devkit.sh
index 4c0538d..47a9866 100755
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -153,9 +153,11 @@ export PATH=$PATH:$TOOLPATH/$package/bin
 
 if [ ! -z $CROSSBUILD ]; then
 	prefix=$INSTALLDIR/$CROSSBUILD/$package
+	toolsprefix=$INSTALLDIR/$CROSSBUILD/tools
 	CROSS_PARAMS="--build=`./config.guess` --host=$CROSSBUILD"
 	CROSS_GCC_PARAMS="--with-gmp=$CROSSPATH --with-mpfr=$CROSSPATH --with-mpc=$CROSSPATH"
 else
+	toolsprefix=$INSTALLDIR/tools
 	prefix=$INSTALLDIR/$package
 fi
 
diff --git a/dka64/scripts/build-tools.sh b/dka64/scripts/build-tools.sh
index 2a92040..273c9bb 100755
--- a/dka64/scripts/build-tools.sh
+++ b/dka64/scripts/build-tools.sh
@@ -6,7 +6,7 @@ do
 	dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
 	cd $BUILDDIR/$dir
 	if [ ! -f configured ]; then
-		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=/opt/devkitpro/tools $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
+		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=$toolsprefix $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
 		touch configured
 	fi
 	if [ ! -f built ]; then
diff --git a/dkarm-eabi/scripts/build-tools.sh b/dkarm-eabi/scripts/build-tools.sh
index 2a92040..273c9bb 100755
--- a/dkarm-eabi/scripts/build-tools.sh
+++ b/dkarm-eabi/scripts/build-tools.sh
@@ -6,7 +6,7 @@ do
 	dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
 	cd $BUILDDIR/$dir
 	if [ ! -f configured ]; then
-		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=/opt/devkitpro/tools $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
+		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=$toolsprefix $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
 		touch configured
 	fi
 	if [ ! -f built ]; then
diff --git a/dkppc/scripts/build-tools.sh b/dkppc/scripts/build-tools.sh
index 859b3b3..384b3f3 100644
--- a/dkppc/scripts/build-tools.sh
+++ b/dkppc/scripts/build-tools.sh
@@ -6,7 +6,7 @@ do
 	dir=$(echo $archive | sed -e 's/\(.*\)\.tar\.bz2/\1/' )
 	cd $BUILDDIR/$dir
 	if [ ! -f configured ]; then
-		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=/opt/devkitpro/tools --disable-dependency-tracking $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
+		CXXFLAGS=$cflags CFLAGS=$cflags LDFLAGS=$ldflags ./configure --prefix=$toolsprefix --disable-dependency-tracking $CROSS_PARAMS || { echo "error configuring $archive"; exit 1; }
 		touch configured
 	fi
 	if [ ! -f built ]; then