kdiff3: fix build for secondary arch

kde-misc/kdiff3/kdiff3-1.8.1.recipe

@@ -18,7 +18,7 @@ COPYRIGHT="
 	2002-2014 Joachim Eibl
 	"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/kde/kdiff3/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="25d4abd0acb604f9ff503eb9650ec6bc048b261079ac9de105b894110e472355"
 SOURCE_DIR="kdiff3-$portVersion"
@@ -27,9 +27,16 @@ ADDITIONAL_FILES="kdiff3.rdef.in"
 ARCHITECTURES="x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 PROVIDES="
 	kdiff3$secondaryArchSuffix = $portVersion
-	app:KDiff3$secondaryArchSuffix = $portVersion
+	app:KDiff3 = $portVersion
 	cmd:kdiff3$commandSuffix = $portVersion
 	"
 REQUIRES="
@@ -104,6 +111,7 @@ BUILD()
 	cd build
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX=$prefix \
+		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
 		-DSHARE_INSTALL_PREFIX=$dataDir \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5
@@ -129,6 +137,6 @@ INSTALL()
 		-e "s|@LONG_INFO@|$LONG_INFO|" \
 		$portDir/additional-files/kdiff3.rdef.in > kdiff3.rdef
 
-	addResourcesToBinaries kdiff3.rdef $binDir/kdiff3
-	addAppDeskbarSymlink $binDir/kdiff3 KDiff3
+	addResourcesToBinaries kdiff3.rdef $commandBinDir/kdiff3
+	addAppDeskbarSymlink $commandBinDir/kdiff3 KDiff3
 }