diff --git a/Packaging/amiga/prep.sh b/Packaging/amiga/prep.sh
index e6e12a08d..ed52c81a5 100755
--- a/Packaging/amiga/prep.sh
+++ b/Packaging/amiga/prep.sh
@@ -1,17 +1,21 @@
 #!/usr/bin/env bash
 
 # exit when any command fails
-set -eo pipefail
+set -euo pipefail
 
 #set compiler params
 export TARGET='m68k-amigaos'
 export SYSROOT=/opt/$TARGET
-export M68K_CPU="-m68040 -mhard-float"
+export M68K_CPU=68040
+export M68K_FPU=hard
+export M68K_CPU_FPU="-m${M68K_CPU} -m${M68K_FPU}-float"
 export M68K_COMMON="-s -ffast-math -fomit-frame-pointer"
-export M68K_CFLAGS="${CFLAGS} ${M68K_CPU} ${M68K_COMMON}"
-export M68K_CXXFLAGS="${CXXFLAGS} ${M68K_CPU} ${M68K_COMMON}"
+export M68K_CFLAGS="${M68K_CPU_FPU} ${M68K_COMMON}"
+export M68K_CXXFLAGS="${M68K_CPU_FPU} ${M68K_COMMON}"
 
 mkdir -p deps
+mkdir -p ${SYSROOT}/usr/lib
+mkdir -p ${SYSROOT}/usr/include
 cd deps
 
 # ZLIB
@@ -19,7 +23,7 @@ wget https://www.zlib.net/zlib-1.2.11.tar.gz -O zlib-1.2.11.tar.gz
 tar -xvf zlib-1.2.11.tar.gz
 mkdir -p zlib-1.2.11/build
 cd zlib-1.2.11/build
-cmake .. -DCMAKE_INSTALL_PREFIX=${SYSROOT} -DM68K_CPU=68040 -DM68K_FPU=hard -DM68K_COMMON="${M68K_COMMON} -O3 -fno-exceptions -w -noixemul -DBIG_ENDIAN -DAMIGA -fpermissive -std=c++14"
+cmake .. -DM68K_CPU="$M68K_CPU" -DM68K_FPU="$M68K_FPU" -DM68K_COMMON="${M68K_COMMON} -O3 -fno-exceptions -w -noixemul -DBIG_ENDIAN -DAMIGA -fpermissive -std=c++14"
 cmake --build . --config Release --target install -- -j$(getconf _NPROCESSORS_ONLN)
 cd ../..
 
@@ -28,8 +32,10 @@ wget https://github.com/AmigaPorts/libSDL12/archive/master.tar.gz -O SDL-1.2.tar
 tar -xvf SDL-1.2.tar.gz
 cd libSDL12-master
 make PREFX=${SYSROOT} PREF=${SYSROOT} -j$(getconf _NPROCESSORS_ONLN)
-cp -fvr libSDL.a ${SYSROOT}/lib
-cp -fvr include/* ${SYSROOT}/include/
+mkdir -p ${SYSROOT}/usr/lib
+mkdir -p ${SYSROOT}/usr/include
+cp -fvr libSDL.a ${SYSROOT}/usr/lib/
+cp -fvr include/* ${SYSROOT}/usr/include/
 cd ..
 
 # SDL_mixer
@@ -37,7 +43,7 @@ wget https://github.com/SDL-mirror/SDL_mixer/archive/SDL-1.2.tar.gz -O SDL_mixer
 tar -xvf SDL_mixer-SDL-1.2.tar.gz
 cd SDL_mixer-SDL-1.2
 ./autogen.sh
-SDL_LIBS='-lSDL -ldebug' SDL_CFLAGS="-I${SYSROOT}/include/SDL -noixemul" CFLAGS="${M68K_CFLAGS}" CXXFLAGS="${M68K_CXXFLAGS}" ./configure --disable-sdltest --disable-shared --enable-static --host=${TARGET} --prefix=${SYSROOT}
+SDL_LIBS='-lSDL -ldebug' SDL_CFLAGS="-I${SYSROOT}/usr/include/SDL -noixemul" CFLAGS="${M68K_CFLAGS}" CXXFLAGS="${M68K_CXXFLAGS}" ./configure --disable-sdltest --disable-shared --enable-static --host=${TARGET} --prefix="${SYSROOT}/usr"
 make -j$(getconf _NPROCESSORS_ONLN)
 make install
 cd ..
@@ -47,7 +53,7 @@ wget https://download.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.gz
 tar -xvf freetype-2.10.1.tar.gz
 mkdir -p freetype-2.10.1/build
 cd freetype-2.10.1/build
-cmake .. -DCMAKE_INSTALL_PREFIX=${SYSROOT} -DUNIX=1 -DM68K_CPU=68040 -DM68K_FPU=hard -DM68K_COMMON="${M68K_COMMON}"
+cmake .. -DUNIX=1 -DM68K_CPU="$M68K_CPU" -DM68K_FPU="$M68K_FPU" -DM68K_COMMON="${M68K_COMMON}"
 cmake --build . --config Release --target install -- -j$(getconf _NPROCESSORS_ONLN)
 cd ../..
 
@@ -56,6 +62,6 @@ wget https://github.com/SDL-mirror/SDL_ttf/archive/SDL-1.2.tar.gz -O SDL_ttf-SDL
 tar -xvf SDL_ttf-SDL-1.2.tar.gz
 cd SDL_ttf-SDL-1.2
 ./autogen.sh
-SDL_LIBS='-lSDL -ldebug' SDL_CFLAGS="-I${SYSROOT}/include/SDL -noixemul"  CFLAGS="${M68K_CFLAGS}" CXXFLAGS="${M68K_CXXFLAGS}" FT2_CFLAGS="-I${SYSROOT}/include/freetype2" FT2_LIBS="-lfreetype -lzlib" ./configure --disable-shared --enable-static --host=${TARGET} --prefix=${SYSROOT}
+LDFLAGS="-L${SYSROOT}/usr/lib" SDL_LIBS='-lSDL -ldebug' SDL_CFLAGS="-L${SYSROOT}/usr/lib -I${SYSROOT}/usr/include/SDL -noixemul"  CFLAGS="${M68K_CFLAGS}" CXXFLAGS="${M68K_CXXFLAGS}" FT2_CFLAGS="-L${SYSROOT}/usr/lib -I${SYSROOT}/usr/include/freetype2" FT2_LIBS="-lfreetype -lzlib" ./configure --disable-shared --enable-static --host=${TARGET} --prefix=${SYSROOT}/usr
 make -j$(getconf _NPROCESSORS_ONLN)
 make install