From 85be7bf6a0d8d812802928d666ff13544c9d4bbb Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com>
Date: Sun, 22 Dec 2019 13:15:03 +0100
Subject: [PATCH] game-tools: cleanup and use the "sysroot" build flag

---
 .../addon-depends/game-tools/bchunk/package.mk       | 10 ++++++----
 .../addon-depends/game-tools/ecm-tools/package.mk    |  5 +----
 .../addons/addon-depends/game-tools/iat/package.mk   |  5 +----
 .../game-tools/linuxconsoletools/package.mk          |  3 ++-
 packages/addons/tools/game-tools/package.mk          | 12 ++++++------
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/packages/addons/addon-depends/game-tools/bchunk/package.mk b/packages/addons/addon-depends/game-tools/bchunk/package.mk
index 73090582fe..f79377ee33 100644
--- a/packages/addons/addon-depends/game-tools/bchunk/package.mk
+++ b/packages/addons/addon-depends/game-tools/bchunk/package.mk
@@ -9,11 +9,13 @@ PKG_SITE="http://he.fi/bchunk/"
 PKG_URL="http://he.fi/bchunk/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Tool to convert a CD image in a .bin/.cue format to a set of .iso and .cdr tracks."
-
-makeinstall_target() {
-  :
-}
+PKG_BUILD_FLAGS="-sysroot"
 
 make_target() {
   make $PKG_MAKE_OPTS_TARGET CC=$CC LD=$CC
 }
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/bin
+  cp -p bchunk $INSTALL/usr/bin
+}
diff --git a/packages/addons/addon-depends/game-tools/ecm-tools/package.mk b/packages/addons/addon-depends/game-tools/ecm-tools/package.mk
index 48c07b6908..8146b67b8d 100644
--- a/packages/addons/addon-depends/game-tools/ecm-tools/package.mk
+++ b/packages/addons/addon-depends/game-tools/ecm-tools/package.mk
@@ -9,7 +9,4 @@ PKG_SITE="https://github.com/alucryd/ecm-tools"
 PKG_URL="https://github.com/alucryd/ecm-tools/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Error Code Modeler.s"
-
-makeinstall_target() {
-  :
-}
+PKG_BUILD_FLAGS="-sysroot"
diff --git a/packages/addons/addon-depends/game-tools/iat/package.mk b/packages/addons/addon-depends/game-tools/iat/package.mk
index 479e3bd3a4..04b1e81fa2 100644
--- a/packages/addons/addon-depends/game-tools/iat/package.mk
+++ b/packages/addons/addon-depends/game-tools/iat/package.mk
@@ -9,9 +9,6 @@ PKG_SITE="https://sourceforge.net/projects/iat.berlios/"
 PKG_URL="https://sourceforge.net/projects/iat.berlios/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Iso9660 Analyzer Tool to detect many structures of image file."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes"
-
-makeinstall_target() {
-  :
-}
diff --git a/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk b/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk
index 7918f9c7aa..1981d71db2 100644
--- a/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk
+++ b/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk
@@ -9,9 +9,10 @@ PKG_SITE="http://sourceforge.net/projects/linuxconsole/"
 PKG_URL="http://prdownloads.sourceforge.net/linuxconsole/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Set of utilities for joysticks and serial devices."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_MAKE_OPTS_TARGET="SYSTEMD_SUPPORT=0"
 
 makeinstall_target() {
-  :
+  make install PREFIX="/usr" DESTDIR="$INSTALL"
 }
diff --git a/packages/addons/tools/game-tools/package.mk b/packages/addons/tools/game-tools/package.mk
index 4c5a5d2727..66effb6b2e 100644
--- a/packages/addons/tools/game-tools/package.mk
+++ b/packages/addons/tools/game-tools/package.mk
@@ -26,17 +26,17 @@ PKG_DEPENDS_TARGET="toolchain \
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
     # bchunk
-    cp -P $(get_build_dir bchunk)/bchunk $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir bchunk)/usr/bin/bchunk $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # ecm-tools
-    cp -P $(get_build_dir ecm-tools)/bin2ecm $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir ecm-tools)/usr/bin/bin2ecm $ADDON_BUILD/$PKG_ADDON_ID/bin
     ln -s bin2ecm $ADDON_BUILD/$PKG_ADDON_ID/bin/ecm2bin
 
     # iat
-    cp -P $(get_build_dir iat)/.$TARGET_NAME/src/iat $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir iat)/usr/bin/iat $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # linuxconsoletools
-    cp -P $(get_build_dir linuxconsoletools)/utils/fftest $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir linuxconsoletools)/utils/jscal $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir linuxconsoletools)/utils/jstest $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir linuxconsoletools)/usr/bin/fftest $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir linuxconsoletools)/usr/bin/jscal $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir linuxconsoletools)/usr/bin/jstest $ADDON_BUILD/$PKG_ADDON_ID/bin
 }