From 18d9f42db761e731ce690196b9cb7293848a64eb Mon Sep 17 00:00:00 2001
From: mkiessling89 <mkiessling89@googlemail.com>
Date: Mon, 9 Oct 2023 23:08:52 +0200
Subject: [PATCH 1/2] remove abs install path

---
 CMakeLists.txt                            | 1 +
 cmake/ETISSPlugin.cmake                   | 4 ++--
 src/bare_etiss_processor/run_helper.sh.in | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77ac7633c6..5006b0c307 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -424,3 +424,4 @@ message(STATUS "ETISS_USE_PYTHON: ${ETISS_USE_PYTHON}")
 message(STATUS "ETISS_USE_PROFILEFLAGS: ${ETISS_USE_PROFILEFLAGS}")
 message(STATUS "ETISS_USE_DLSYM: ${ETISS_USE_DLSYM}")
 message(STATUS "ETISS_BUILD_MANUAL_DOC: ${ETISS_BUILD_MANUAL_DOC}")
+
diff --git a/cmake/ETISSPlugin.cmake b/cmake/ETISSPlugin.cmake
index a656bc1d8c..b1f9ee2600 100644
--- a/cmake/ETISSPlugin.cmake
+++ b/cmake/ETISSPlugin.cmake
@@ -11,12 +11,12 @@ MACRO(ETISSPlugin ProjName)
     INSTALL(CODE
         "FILE(APPEND
             \"${CMAKE_INSTALL_PREFIX}/lib/plugins/list.txt\"
-            \"${ProjName},\${CMAKE_INSTALL_PREFIX}/lib/plugins,${ProjName}\\n\"
+            \"${ProjName},./lib/plugins,${ProjName}\\n\"
         )"
     )
 
     # mimicing installation in build tree as well
-    file(APPEND ${ETISS_BINARY_DIR}/lib/plugins/list.txt
+    file(APPEND ./lib/plugins/list.txt
     "${ProjName},${ETISS_BINARY_DIR}/lib/plugins,${ProjName}\n")
 ENDMACRO()
 
diff --git a/src/bare_etiss_processor/run_helper.sh.in b/src/bare_etiss_processor/run_helper.sh.in
index 27574e8391..8a723f67f8 100755
--- a/src/bare_etiss_processor/run_helper.sh.in
+++ b/src/bare_etiss_processor/run_helper.sh.in
@@ -2,7 +2,7 @@
 set -e
 # Config
 
-ETISS_DIR=@ETISS_DIR@
+ETISS_BIN_DIR=$(dirname -- "$(readlink -f -- "$0")")
 
 # Clear tmp file
 DYN_INI=$(mktemp /tmp/etiss_dynamic_XXXXXXXXXX.ini)
@@ -30,7 +30,7 @@ TARGETSW_PATH_ELF=$1
 TARGET_ELFFILE=$(basename -- "$TARGETSW_PATH_ELF")
 TARGET_ELFDIR=$(dirname -- "$TARGETSW_PATH_ELF")
 
-VP_EXE="${ETISS_DIR}/bin/bare_etiss_processor"
+VP_EXE="${ETISS_BIN_DIR}/bare_etiss_processor"
 
 
 CMD_OPTIONS=""
@@ -100,7 +100,7 @@ echo -e "simple_mem_system.memseg_origin_01=0x00080000" >> $DYN_INI
 echo -e "simple_mem_system.memseg_length_01=0x00080000" >> $DYN_INI
 
 # Call
-ARGS="-i${ETISS_DIR}/examples/base.ini -i${DYN_INI} ${CMD_OPTIONS}"
+ARGS="-i${ETISS_BIN_DIR}/../examples/base.ini -i${DYN_INI} ${CMD_OPTIONS}"
 
 if [ "${USE_TGDB}" -eq 1 ]; then
     if [ "${DO_NOT_ATTACH}" -eq 0 ]; then

From 45dcbf52cf1cccc42014371fae5a58e585c346dc Mon Sep 17 00:00:00 2001
From: mkiessling89 <mkiessling89@googlemail.com>
Date: Mon, 9 Oct 2023 23:38:32 +0200
Subject: [PATCH 2/2] revert change

---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5006b0c307..77ac7633c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -424,4 +424,3 @@ message(STATUS "ETISS_USE_PYTHON: ${ETISS_USE_PYTHON}")
 message(STATUS "ETISS_USE_PROFILEFLAGS: ${ETISS_USE_PROFILEFLAGS}")
 message(STATUS "ETISS_USE_DLSYM: ${ETISS_USE_DLSYM}")
 message(STATUS "ETISS_BUILD_MANUAL_DOC: ${ETISS_BUILD_MANUAL_DOC}")
-