diff --git a/packages/emulation/cyclone68000/package.mk b/packages/emulation/cyclone68000/package.mk
index 2f96132f9e..52275404fd 100644
--- a/packages/emulation/cyclone68000/package.mk
+++ b/packages/emulation/cyclone68000/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="66dda842eae01f47f5389b931ec9567fb0bbb6a1"
 PKG_SHA256="c59900531e35e7303e1172d9bd5d161491b4554983930ad855614252156ea0e0"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/notaz/cyclone68000"
-PKG_URL="https://github.com/notaz/cyclone68000/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/notaz/cyclone68000/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Motorola 68000 emulator written in ARM assembly"
 PKG_TOOLCHAIN="manual"
diff --git a/packages/emulation/libretro-2048/package.mk b/packages/emulation/libretro-2048/package.mk
index bca2fe3931..95b4f55ee8 100644
--- a/packages/emulation/libretro-2048/package.mk
+++ b/packages/emulation/libretro-2048/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="6e91356b9a901410017184a0d7772e40a92332a6"
 PKG_SHA256="814fc0a89f6bd6771002096d4a426e7c005b0f62d9e175a32339614f8382180d"
 PKG_LICENSE="Public domain"
 PKG_SITE="https://github.com/libretro/libretro-2048"
-PKG_URL="https://github.com/libretro/libretro-2048/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/libretro-2048/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.2048: 2048 for Kodi"
 
 PKG_LIBNAME="2048_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="2048_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-4do/package.mk b/packages/emulation/libretro-4do/package.mk
index 2098a7bead..ad80801328 100644
--- a/packages/emulation/libretro-4do/package.mk
+++ b/packages/emulation/libretro-4do/package.mk
@@ -6,16 +6,16 @@ PKG_VERSION="da814a868c41fb47f265e04e5f95756cda62e5c2"
 PKG_SHA256="6a3ec326d35ae55fa4e749c600d9eb538fb7c1c3b9ffd1fa1ac6064f4bf5e7b4"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://github.com/libretro/4do-libretro"
-PKG_URL="https://github.com/libretro/4do-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/4do-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Port of 4DO/libfreedo to libretro."
 
 PKG_LIBNAME="4do_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="4DO_LIB"
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-atari800/package.mk b/packages/emulation/libretro-atari800/package.mk
index 8eb9e642b4..9d1e5c2830 100644
--- a/packages/emulation/libretro-atari800/package.mk
+++ b/packages/emulation/libretro-atari800/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="8ce851fbca0d360763a267322f6a76c3c80ddae6"
 PKG_SHA256="4a1b17cbdb606dbc444984a70753b98797a7b4634e4c9fea998e5db08ee25ba6"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/libretro-atari800"
-PKG_URL="https://github.com/libretro/libretro-atari800/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/libretro-atari800/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="Atari 8-bit computer and 5200 console emulator"
 PKG_TOOLCHAIN="make"
@@ -14,11 +14,11 @@ PKG_TOOLCHAIN="make"
 PKG_MAKE_OPTS_TARGET="platform=unix"
 
 PKG_LIBNAME="atari800_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="ATARI800_LIB"
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-beetle-bsnes/package.mk b/packages/emulation/libretro-beetle-bsnes/package.mk
index f9933ebfd8..21c9e8c774 100644
--- a/packages/emulation/libretro-beetle-bsnes/package.mk
+++ b/packages/emulation/libretro-beetle-bsnes/package.mk
@@ -6,21 +6,21 @@ PKG_VERSION="0d6221a5fca708b36fa090d1c261663910d1e67e"
 PKG_SHA256="46a20d9c16f853deff45b61ec50ea312b0afb1e2c3aaa024e57cdc78a2ad79fe"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-bsnes-libretro"
-PKG_URL="https://github.com/libretro/beetle-bsnes-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/beetle-bsnes-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.beetle-bsnes: Beetle bSNES for Kodi"
 
 PKG_LIBNAME="mednafen_snes_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BEETLE-BSNES_LIB"
 
 make_target() {
-  LDFLAGS="$LDFLAGS -ldl"
+  LDFLAGS+=" -ldl"
   make
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-beetle-gba/package.mk b/packages/emulation/libretro-beetle-gba/package.mk
index 68f6e1d795..5a94835652 100644
--- a/packages/emulation/libretro-beetle-gba/package.mk
+++ b/packages/emulation/libretro-beetle-gba/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="5dc23a3e302bd11efe997ae92e282e7d603c5813"
 PKG_SHA256="bc711802fdac5a66d1208447a1265aec737832bbb360ec2ea21a8af2216c2e67"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-gba-libretro"
-PKG_URL="https://github.com/libretro/beetle-gba-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/beetle-gba-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.beetle-gba: Beetle GBA for Kodi"
 
 PKG_LIBNAME="mednafen_gba_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BEETLE-GBA_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-beetle-lynx/package.mk b/packages/emulation/libretro-beetle-lynx/package.mk
index 4a1a1bb7cc..6883dce7de 100644
--- a/packages/emulation/libretro-beetle-lynx/package.mk
+++ b/packages/emulation/libretro-beetle-lynx/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="559be1d83418b6309ce72db9c175c5bec6bcd549"
 PKG_SHA256="1083966de10c5ee925c208dd9b20619f7221402b1ff487e76d4b994f97ab5ed1"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-lynx-libretro"
-PKG_URL="https://github.com/libretro/beetle-lynx-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/beetle-lynx-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="Standalone port of Mednafen Lynx to libretro, itself a fork of Handy"
 
 PKG_LIBNAME="mednafen_lynx_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BEETLE-LYNX_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-beetle-ngp/package.mk b/packages/emulation/libretro-beetle-ngp/package.mk
index bba9994082..393d2351d4 100644
--- a/packages/emulation/libretro-beetle-ngp/package.mk
+++ b/packages/emulation/libretro-beetle-ngp/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="38f0e6a80724fe92a7e7914d378abff4561c942e"
 PKG_SHA256="3d8b2750093a6921bd512f207bc235c3755558ccdafbb5249a69a2639f05809a"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-ngp-libretro"
-PKG_URL="https://github.com/libretro/beetle-ngp-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/beetle-ngp-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="Standalone port of Mednafen NGP to the libretro API, itself a fork of Neopop"
 
 PKG_LIBNAME="mednafen_ngp_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BEETLE-NGP_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-beetle-pce-fast/package.mk b/packages/emulation/libretro-beetle-pce-fast/package.mk
index 36b5207f43..d711d16a26 100644
--- a/packages/emulation/libretro-beetle-pce-fast/package.mk
+++ b/packages/emulation/libretro-beetle-pce-fast/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="cd46fd82aea1ead94e9771b69b73fbea5bcff904"
 PKG_SHA256="050a8e2d9daeae7c7b18ba8d4496a1f2835c49734b51878728f38db6cc372914"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-pce-fast-libretro"
-PKG_URL="https://github.com/libretro/beetle-pce-fast-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/beetle-pce-fast-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.beetle-pce-fast: Beetle PCE Fast for Kodi"
 
 PKG_LIBNAME="mednafen_pce_fast_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BEETLE-PCE-FAST_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-beetle-pcfx/package.mk b/packages/emulation/libretro-beetle-pcfx/package.mk
index 41a2a21260..a19ae5cd36 100644
--- a/packages/emulation/libretro-beetle-pcfx/package.mk
+++ b/packages/emulation/libretro-beetle-pcfx/package.mk
@@ -6,16 +6,16 @@ PKG_VERSION="294ecfc09a8dc4d1a20b83ad518283e24cbdb676"
 PKG_SHA256="05c1fbc498ddb6ab60a0e02acc7eedc38f3fe771956bf485a0aa09790dadf015"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-pcfx-libretro"
-PKG_URL="https://github.com/libretro/beetle-pcfx-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/beetle-pcfx-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="Standalone port of Mednafen PCFX to libretro"
 
 PKG_LIBNAME="mednafen_pcfx_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BEETLE-PCFX_LIB"
 
 make_target() {
-  case $TARGET_CPU in
+  case ${TARGET_CPU} in
     arm1176jzf-s)
       make platform=armv6-hardfloat
       ;;
@@ -23,7 +23,7 @@ make_target() {
       make platform=armv7-neon-hardfloat
       ;;
     cortex-a9|*cortex-a53|cortex-a17)
-      if [ "$TARGET_ARCH" = "aarch64" ]; then
+      if [ "${TARGET_ARCH}" = "aarch64" ]; then
         make platform=aarch64
       else
         make platform=armv7-cortexa9-neon-hardfloat
@@ -36,7 +36,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-beetle-psx/package.mk b/packages/emulation/libretro-beetle-psx/package.mk
index 4d214f75dc..ca8d26ccf5 100644
--- a/packages/emulation/libretro-beetle-psx/package.mk
+++ b/packages/emulation/libretro-beetle-psx/package.mk
@@ -6,16 +6,16 @@ PKG_VERSION="c6ee7ce49551fadcff96cbbe26299646e6890b1e"
 PKG_SHA256="a82fddea6b72dacd0accf50d11729f8b0ba5d9c3b2132f3b0c5c139699b68f82"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-psx-libretro"
-PKG_URL="https://github.com/libretro/beetle-psx-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/beetle-psx-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="Fork of Mednafen PSX"
 
 PKG_LIBNAME="mednafen_psx_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BEETLE-PSX_LIB"
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-beetle-saturn/package.mk b/packages/emulation/libretro-beetle-saturn/package.mk
index d0a5a6f166..f2b556fbe0 100644
--- a/packages/emulation/libretro-beetle-saturn/package.mk
+++ b/packages/emulation/libretro-beetle-saturn/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="d24c9c4be3147cea7e2ff34b9800afd586014c5a"
 PKG_SHA256="811a8dc2e9d3497cc60ceee2f7e148981b27d34c94f07634ccb84dc460f72471"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/beetle-saturn-libretro"
-PKG_URL="https://github.com/libretro/beetle-saturn-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/beetle-saturn-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.beetle-saturn: beetle-saturn for Kodi"
 
 PKG_LIBNAME="mednafen_saturn_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BEETLE-SATURN_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-beetle-supergrafx/package.mk b/packages/emulation/libretro-beetle-supergrafx/package.mk
index d1de768545..4affbde179 100644
--- a/packages/emulation/libretro-beetle-supergrafx/package.mk
+++ b/packages/emulation/libretro-beetle-supergrafx/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="0bb8e212ce2216ed726e4e648ba7f1ca9bac2f5a"
 PKG_SHA256="0eb77c7ea5102fca39502e26a8eed864374410e7194ea9ad78f0308690281bfc"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-supergrafx-libretro"
-PKG_URL="https://github.com/libretro/beetle-supergrafx-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/beetle-supergrafx-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="Standalone port of Mednafen PCE Fast to libretro. This one only emulates a SuperGrafx TG-16"
 
 PKG_LIBNAME="mednafen_supergrafx_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BEETLE-SUPERGRAFX_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-beetle-vb/package.mk b/packages/emulation/libretro-beetle-vb/package.mk
index b6d9761bad..7390e80eaa 100644
--- a/packages/emulation/libretro-beetle-vb/package.mk
+++ b/packages/emulation/libretro-beetle-vb/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="a410d5cf3fa529c2a3970df34fee17b068f53168"
 PKG_SHA256="d15a1bc7875dd6de244f9e357a6097c75c195faca2ebf5eaddd6741c2af33c42"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-vb-libretro"
-PKG_URL="https://github.com/libretro/beetle-vb-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/beetle-vb-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="Standalone port of Mednafen VB to libretro"
 
 PKG_LIBNAME="mednafen_vb_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BEETLE-VB_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-beetle-wswan/package.mk b/packages/emulation/libretro-beetle-wswan/package.mk
index 5dc08a4b57..887846a2b4 100644
--- a/packages/emulation/libretro-beetle-wswan/package.mk
+++ b/packages/emulation/libretro-beetle-wswan/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="5f9cc2e732fcca23e5cfe11fcf156f91007186a4"
 PKG_SHA256="5d2501a298f505381ea210518e0df73b4be38e75420a93dbe94f453025cde6ce"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/beetle-wswan-libretro"
-PKG_URL="https://github.com/libretro/beetle-wswan-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/beetle-wswan-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="Standalone port of Mednafen WonderSwan to libretro, itself a fork of Cygne"
 
 PKG_LIBNAME="mednafen_wswan_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BEETLE-WSWAN_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-bluemsx/package.mk b/packages/emulation/libretro-bluemsx/package.mk
index da64768137..806f579c15 100644
--- a/packages/emulation/libretro-bluemsx/package.mk
+++ b/packages/emulation/libretro-bluemsx/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="29eca1e7874f16bf9f997c51bf1dc14298083e71"
 PKG_SHA256="0a0333988d7afe0cad4ae923bf9f90d50d5a67c7b096c11b1e23aa9a8df78a07"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/blueMSX-libretro"
-PKG_URL="https://github.com/libretro/blueMSX-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/blueMSX-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.bluemsx: BlueMSX for Kodi"
 
 PKG_LIBNAME="bluemsx_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BLUEMSX_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-bnes/package.mk b/packages/emulation/libretro-bnes/package.mk
index 5bbd2d42c1..d02fd4c454 100644
--- a/packages/emulation/libretro-bnes/package.mk
+++ b/packages/emulation/libretro-bnes/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="8e26e89a93bef8eb8992d1921b539dce1792660a"
 PKG_SHA256="c151e1296b8f6c035014dc62919692097feeebb19ae73294f1b9781edf1921b1"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/bnes-libretro"
-PKG_URL="https://github.com/libretro/bnes-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/bnes-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.bnes: bNES for Kodi"
 
 PKG_LIBNAME="bnes_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BNES_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk b/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk
index e6c09c4151..db676d51c5 100644
--- a/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk
+++ b/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="60d38df01b2cb389fe61c8d821315691374a8b27"
 PKG_SHA256="01f1678445a358d762ef021148c62c646b7591da73942742af9e58c5f85e227e"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/bsnes-mercury"
-PKG_URL="https://github.com/libretro/bsnes-mercury/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/bsnes-mercury/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.beetle-bsnes-accuracy: Beetle bSNES for Kodi"
 
 PKG_LIBNAME="bsnes_mercury_accuracy_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BSNES-MERCURY-ACCURACY_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-bsnes-mercury-balanced/package.mk b/packages/emulation/libretro-bsnes-mercury-balanced/package.mk
index a631901994..9ea7c7bbc8 100644
--- a/packages/emulation/libretro-bsnes-mercury-balanced/package.mk
+++ b/packages/emulation/libretro-bsnes-mercury-balanced/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="60d38df01b2cb389fe61c8d821315691374a8b27"
 PKG_SHA256="01f1678445a358d762ef021148c62c646b7591da73942742af9e58c5f85e227e"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/bsnes-mercury"
-PKG_URL="https://github.com/libretro/bsnes-mercury/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/bsnes-mercury/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.beetle-bsnes-balanced: Beetle bSNES for Kodi"
 
 PKG_LIBNAME="bsnes_mercury_balanced_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BSNES-MERCURY-BALANCED_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-bsnes-mercury-performance/package.mk b/packages/emulation/libretro-bsnes-mercury-performance/package.mk
index 3885eeb487..2f1abdc3c7 100644
--- a/packages/emulation/libretro-bsnes-mercury-performance/package.mk
+++ b/packages/emulation/libretro-bsnes-mercury-performance/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="60d38df01b2cb389fe61c8d821315691374a8b27"
 PKG_SHA256="01f1678445a358d762ef021148c62c646b7591da73942742af9e58c5f85e227e"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/bsnes-mercury"
-PKG_URL="https://github.com/libretro/bsnes-mercury/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/bsnes-mercury/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.beetle-bsnes-performance: Beetle bSNES for Kodi"
 
 PKG_LIBNAME="bsnes_mercury_performance_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BSNES-MERCURY-PERFORMANCE_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-cap32/package.mk b/packages/emulation/libretro-cap32/package.mk
index e621634d9c..adee65eb7b 100644
--- a/packages/emulation/libretro-cap32/package.mk
+++ b/packages/emulation/libretro-cap32/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="4c470bb36b6bca00866d07c2036732ab85747a2a"
 PKG_SHA256="40a5cb903b1c45c08cc7671a8546d7b3da9e88499e0910bf3aab483655efd57b"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/libretro-cap32"
-PKG_URL="https://github.com/libretro/libretro-cap32/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/libretro-cap32/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.cap32: cap32 for Kodi"
 
 PKG_LIBNAME="cap32_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="CAP32_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-desmume/package.mk b/packages/emulation/libretro-desmume/package.mk
index a04cdffe22..6a91c27ca2 100644
--- a/packages/emulation/libretro-desmume/package.mk
+++ b/packages/emulation/libretro-desmume/package.mk
@@ -6,22 +6,22 @@ PKG_VERSION="d9923420d55e8bda61aaa15cb003b498375a2cb6"
 PKG_SHA256="a42ab96148a572d57174e2434dde22d5927d9b8432bed61c60b6433005f3f5c3"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/desmume"
-PKG_URL="https://github.com/libretro/desmume/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/desmume/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="libretro wrapper for desmume NDS emulator."
 PKG_TOOLCHAIN="make"
 
 PKG_LIBNAME="desmume_libretro.so"
-PKG_LIBPATH="desmume/$PKG_LIBNAME"
+PKG_LIBPATH="desmume/${PKG_LIBNAME}"
 PKG_LIBVAR="DESMUME_LIB"
 
 make_target() {
-  case $TARGET_CPU in
+  case ${TARGET_CPU} in
     arm1176jzf-s)
-      make -C desmume -f Makefile.libretro platform=armv6-hardfloat-$TARGET_CPU
+      make -C desmume -f Makefile.libretro platform=armv6-hardfloat-${TARGET_CPU}
       ;;
     cortex-a7|cortex-a9)
-      make -C desmume -f Makefile.libretro platform=armv7-neon-hardfloat-$TARGET_CPU
+      make -C desmume -f Makefile.libretro platform=armv7-neon-hardfloat-${TARGET_CPU}
       ;;
     x86-64)
       make -C desmume -f Makefile.libretro
@@ -30,7 +30,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-dinothawr/package.mk b/packages/emulation/libretro-dinothawr/package.mk
index 561cf826be..dcddd1f7ce 100644
--- a/packages/emulation/libretro-dinothawr/package.mk
+++ b/packages/emulation/libretro-dinothawr/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="a4083e0b0937c38e96d74b055765fbfbe69f2664"
 PKG_SHA256="14212b011376ebd5f39c6c2eeb95db4d0378d5e66300fd4ba1a4730dd104bf73"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/Dinothawr"
-PKG_URL="https://github.com/libretro/Dinothawr/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/Dinothawr/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.dinothawr: dinothawr for Kodi"
 
 PKG_LIBNAME="dinothawr_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="DINOTHAWR_LIB"
 
 pre_make_target() {
@@ -21,7 +21,7 @@ pre_make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-dolphin/package.mk b/packages/emulation/libretro-dolphin/package.mk
index a8f45b71e5..bcbe8570d1 100644
--- a/packages/emulation/libretro-dolphin/package.mk
+++ b/packages/emulation/libretro-dolphin/package.mk
@@ -7,18 +7,18 @@ PKG_SHA256="3acfdb0dee34773cfc67b045f135465f5e96e4de7b2912dfe61c6ea7c7d7e4d2"
 PKG_ARCH="none"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/dolphin"
-PKG_URL="https://github.com/libretro/dolphin/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/dolphin/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform enet"
 PKG_LONGDESC="Dolphin is a GameCube / Wii emulator, allowing you to play games for these two platforms on PC"
 
 PKG_LIBNAME="dolphin_libretro.so"
-PKG_LIBPATH="libretro/$PKG_LIBNAME"
+PKG_LIBPATH="libretro/${PKG_LIBNAME}"
 PKG_LIBVAR="DOLPHIN_LIB"
 
 pre_configure_target() {
   # fails to build in subdirs
-  cd $PKG_BUILD
-  rm -rf .$TARGET_NAME
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}
 }
 
 make_target() {
@@ -26,7 +26,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-dosbox/package.mk b/packages/emulation/libretro-dosbox/package.mk
index 42409f79c8..7fc92a0dbc 100644
--- a/packages/emulation/libretro-dosbox/package.mk
+++ b/packages/emulation/libretro-dosbox/package.mk
@@ -6,13 +6,13 @@ PKG_VERSION="665d16d4edaeb8b1d6170c4bcf3747d20b03d032"
 PKG_SHA256="3206f8f9f2ffb3aba6580ad21b2415684ed18680ec046aac97ad869d47f3decc"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/dosbox-libretro"
-PKG_URL="https://github.com/libretro/dosbox-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/dosbox-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.dosbox: DOSBox for Kodi"
 PKG_BUILD_FLAGS="+pic"
 
 PKG_LIBNAME="dosbox_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="DOSBOX_LIB"
 
 make_target() {
@@ -20,7 +20,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-fbalpha/package.mk b/packages/emulation/libretro-fbalpha/package.mk
index abc268c96a..476099df47 100644
--- a/packages/emulation/libretro-fbalpha/package.mk
+++ b/packages/emulation/libretro-fbalpha/package.mk
@@ -6,20 +6,20 @@ PKG_VERSION="3edb7789803aaefeb34907f8dfec9d5bf26486ed"
 PKG_SHA256="3cd1b78fd1b253c798cd2ed1948e5d5ec4d481a398c323435108b3c3f5e29dab"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/fbalpha"
-PKG_URL="https://github.com/libretro/fbalpha/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/fbalpha/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.fba: fba for Kodi"
 PKG_TOOLCHAIN="make"
 
 PKG_LIBNAME="fbalpha_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="FBALPHA_LIB"
 
 pre_make_target() {
-  PKG_MAKE_OPTS_TARGET="-f makefile.libretro CC=$CC CXX=$CXX GIT_VERSION=${PKG_VERSION:0:7}"
+  PKG_MAKE_OPTS_TARGET="-f makefile.libretro CC=${CC} CXX=${CXX} GIT_VERSION=${PKG_VERSION:0:7}"
 
-  if [ "$PROJECT" = "RPi" ]; then
-    case $DEVICE in
+  if [ "${PROJECT}" = "RPi" ]; then
+    case ${DEVICE} in
       RPi)
         PKG_MAKE_OPTS_TARGET+=" platform=armv"
         ;;
@@ -36,7 +36,7 @@ pre_make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-fceumm/package.mk b/packages/emulation/libretro-fceumm/package.mk
index b02b44c427..f2ed569ec7 100644
--- a/packages/emulation/libretro-fceumm/package.mk
+++ b/packages/emulation/libretro-fceumm/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="e7e7610c27560fcf0d82ca258912bea15779b23e"
 PKG_SHA256="b1f998e9be80d553dc9c9bea72ce279bb95449984aa5d8b1c2e36c56d0ffdf56"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/libretro-fceumm"
-PKG_URL="https://github.com/libretro/libretro-fceumm/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/libretro-fceumm/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.fceumm: FCEUmm emulator for Kodi"
 
 PKG_LIBNAME="fceumm_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="FCEUMM_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-fmsx/package.mk b/packages/emulation/libretro-fmsx/package.mk
index b4b50d4d09..c758b92238 100644
--- a/packages/emulation/libretro-fmsx/package.mk
+++ b/packages/emulation/libretro-fmsx/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="fdc6a2f5f40428f2b38d5e533f542e2a9206b080"
 PKG_SHA256="2b3a68ca3f0c3f2a6e65dac5d661958e7fd779d24890ac1fb2270da2e948644b"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/fmsx-libretro"
-PKG_URL="https://github.com/libretro/fmsx-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/fmsx-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.fmsx: fmsx for Kodi"
 
 PKG_LIBNAME="fmsx_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="FMSX_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-fsuae/package.mk b/packages/emulation/libretro-fsuae/package.mk
index 0a06678726..9f403f5ce6 100644
--- a/packages/emulation/libretro-fsuae/package.mk
+++ b/packages/emulation/libretro-fsuae/package.mk
@@ -7,35 +7,35 @@ PKG_SHA256="0beaf41955733f30cf092e7aa7e4f5e07a64c0608783fb7e6c820711c44e4ed9"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/libretro-fsuae"
-PKG_URL="https://github.com/libretro/libretro-fsuae/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/libretro-fsuae/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain glib libmpeg2 openal-soft libpng"
 PKG_LONGDESC="FS-UAE amiga emulator."
 PKG_BUILD_FLAGS="-lto"
 PKG_TOOLCHAIN="autotools"
 
 PKG_LIBNAME="fsuae_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="FSUAE_LIB"
 
-if [ "$TARGET_ARCH" = "arm" ] && target_has_feature neon; then
+if [ "${TARGET_ARCH}" = "arm" ] && target_has_feature neon; then
   PKG_CONFIGURE_OPTS_TARGET="--disable-jit --enable-neon"
 fi
 
 pre_configure_target() {
-  cd $PKG_BUILD
-  rm -rf .$TARGET_NAME
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}
   # check if this flag is still needed when this package is updated
-  export CFLAGS="$CFLAGS -fcommon"
+  export CFLAGS="${CFLAGS} -fcommon"
   export ac_cv_func_realloc_0_nonnull=yes
 }
 
 make_target() {
-  make -j1 CC="$CC" gen
-  make CC="$CC"
+  make -j1 CC="${CC}" gen
+  make CC="${CC}"
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-fuse/package.mk b/packages/emulation/libretro-fuse/package.mk
index 156463f91d..5d4e18ae04 100644
--- a/packages/emulation/libretro-fuse/package.mk
+++ b/packages/emulation/libretro-fuse/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="33710427a519c82bb38654c5a098272e14fc1823"
 PKG_SHA256="dde8486f541b942682bf7ffdcd0b4537c8391db44f6a78d2f6e6dfce499d1b3e"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/fuse-libretro"
-PKG_URL="https://github.com/libretro/fuse-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/fuse-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.fuse: fuse for Kodi"
 
 PKG_LIBNAME="fuse_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="FUSE_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-gambatte/package.mk b/packages/emulation/libretro-gambatte/package.mk
index e859636025..f6b6e109cf 100644
--- a/packages/emulation/libretro-gambatte/package.mk
+++ b/packages/emulation/libretro-gambatte/package.mk
@@ -6,16 +6,16 @@ PKG_VERSION="fce2e5a6a9c4ba236325d74ea449109898724cda"
 PKG_SHA256="9e1976366bf9a0c04460bc4cf449b9c99ee824a605859d02c6f5da2f501cbb66"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/gambatte-libretro"
-PKG_URL="https://github.com/libretro/gambatte-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/gambatte-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.gambatte: Gambatte for Kodi"
 
 PKG_LIBNAME="gambatte_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="GAMBATTE_LIB"
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-genplus/package.mk b/packages/emulation/libretro-genplus/package.mk
index 12ae009052..2ad55f1942 100644
--- a/packages/emulation/libretro-genplus/package.mk
+++ b/packages/emulation/libretro-genplus/package.mk
@@ -6,25 +6,25 @@ PKG_VERSION="f23676488eea5821e38f42eb143011d492f36df5"
 PKG_SHA256="4f6816add17915ea5c9c335e9f4e56a5c5d50b7d3d811eda848b4dd02acc04d2"
 PKG_LICENSE="Modified BSD / LGPLv2.1"
 PKG_SITE="https://github.com/libretro/Genesis-Plus-GX"
-PKG_URL="https://github.com/libretro/Genesis-Plus-GX/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/Genesis-Plus-GX/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.genplus: Genesis Plus GX for Kodi"
 PKG_TOOLCHAIN="manual"
 
 PKG_LIBNAME="genesis_plus_gx_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="GENPLUS_LIB"
 
 make_target() {
-  if [ "$ARCH" = "arm" ]; then
-    CFLAGS="$CFLAGS -DALIGN_LONG"
+  if [ "${ARCH}" = "arm" ]; then
+    CFLAGS+=" -DALIGN_LONG"
   fi
 
-  make -f Makefile.libretro GIT_VERSION=$PKG_VERSION
+  make -f Makefile.libretro GIT_VERSION=${PKG_VERSION}
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-gw/package.mk b/packages/emulation/libretro-gw/package.mk
index 19affaef16..fcf76c0611 100644
--- a/packages/emulation/libretro-gw/package.mk
+++ b/packages/emulation/libretro-gw/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="819b1dde560013003eeac86c2069c5be7af25c6d"
 PKG_SHA256="e5dc930b9f835a617211c78d5efd7998b3e4d12660465ad2e53fc8e09da0d86f"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/gw-libretro"
-PKG_URL="https://github.com/libretro/gw-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/gw-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.gw: gw for Kodi"
 
 PKG_LIBNAME="gw_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="GW_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-handy/package.mk b/packages/emulation/libretro-handy/package.mk
index a6ea2fb7db..69da2eb304 100644
--- a/packages/emulation/libretro-handy/package.mk
+++ b/packages/emulation/libretro-handy/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="dba810a87ebae87392259c68dcab7a35f6000aac"
 PKG_SHA256="8209510e60dc317d0b1cd4bb0c9b248e187401a772f3d6c9d8737070bfb80246"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/libretro-handy"
-PKG_URL="https://github.com/libretro/libretro-handy/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/libretro-handy/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.handy: handy for Kodi"
 
 PKG_LIBNAME="handy_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="HANDY_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-hatari/package.mk b/packages/emulation/libretro-hatari/package.mk
index 0d53eb6401..0f31adc3bf 100644
--- a/packages/emulation/libretro-hatari/package.mk
+++ b/packages/emulation/libretro-hatari/package.mk
@@ -6,22 +6,22 @@ PKG_VERSION="f19bc118b4e39f5b5131505d5ead09109384be8f"
 PKG_SHA256="62606ae3763b0fe152a09ebb303e4c22cdafdec333d437800d71d5842fcbd594"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/hatari"
-PKG_URL="https://github.com/libretro/hatari/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/hatari/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.hatari: hatari for Kodi"
 PKG_TOOLCHAIN="manual"
 
 PKG_LIBNAME="hatari_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="HATARI_LIB"
 
 make_target() {
-  cd $PKG_BUILD
+  cd ${PKG_BUILD}
   make -f Makefile.libretro
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-mame/package.mk b/packages/emulation/libretro-mame/package.mk
index 939b6dab82..f7dfa25040 100644
--- a/packages/emulation/libretro-mame/package.mk
+++ b/packages/emulation/libretro-mame/package.mk
@@ -7,14 +7,14 @@ PKG_SHA256="acdee7eeac28de1ab257cd2593c3d3266863875139d9a201f572d8044e3eb96e"
 PKG_ARCH="x86_64 arm"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame"
-PKG_URL="https://github.com/libretro/mame/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/mame/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.mame: MAME for Kodi"
 PKG_BUILD_FLAGS="-gold -lto"
 PKG_TOOLCHAIN="make"
 
 PKG_LIBNAME="mame_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="MAME_LIB"
 
 pre_make_target() {
@@ -24,19 +24,19 @@ pre_make_target() {
     CROSS_BUILD="1" OVERRIDE_CC="${CC}" OVERRIDE_CXX="${CXX}" \
     TARGET="mame" SUBTARGET="arcade" PLATFORM="${ARCH}" RETRO=1 OSD="retro""
 
-  if [ "$ARCH" = "arm" ]; then
+  if [ "${ARCH}" = "arm" ]; then
     PKG_MAKE_OPTS_TARGET+=" NOASM="1" ARCHITECTURE="""
-  elif [ "$ARCH" = "x86_64" ]; then
+  elif [ "${ARCH}" = "x86_64" ]; then
     PKG_MAKE_OPTS_TARGET+=" NOASM="0" PTR64="1""
   fi
 }
 
 post_make_target() {
-  mv $PKG_BUILD/mamearcade_libretro.so $PKG_BUILD/mame_libretro.so
+  mv ${PKG_BUILD}/mamearcade_libretro.so ${PKG_BUILD}/mame_libretro.so
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-mame2000/package.mk b/packages/emulation/libretro-mame2000/package.mk
index 2bcc59f378..d565336d8a 100644
--- a/packages/emulation/libretro-mame2000/package.mk
+++ b/packages/emulation/libretro-mame2000/package.mk
@@ -6,16 +6,16 @@ PKG_VERSION="6655a5122c4a34e57de933fedafa3c6ec6a221be"
 PKG_SHA256="92e4292e892d534b66ba1185107b228a67bbfef106db02c88443f37309523eea"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame2000-libretro"
-PKG_URL="https://github.com/libretro/mame2000-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/mame2000-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="2000 version of MAME (0.37b5) for libretro"
 
 PKG_LIBNAME="mame2000_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="MAME2000_LIB"
 
 make_target() {
-  if [ "$TARGET_ARCH" = "arm" ]; then
+  if [ "${TARGET_ARCH}" = "arm" ]; then
     make ARM=1
   else
     make
@@ -23,7 +23,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-mame2003/package.mk b/packages/emulation/libretro-mame2003/package.mk
index 6046287762..c581225f61 100644
--- a/packages/emulation/libretro-mame2003/package.mk
+++ b/packages/emulation/libretro-mame2003/package.mk
@@ -6,20 +6,20 @@ PKG_VERSION="b04cf1f2cea50a4f19d6c783829d2abb6b1010b4"
 PKG_SHA256="d495ca9e7b4ecedaec552f686e01f61f359d8cc1f4fcb73367b3053e29502278"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame2003-libretro"
-PKG_URL="https://github.com/libretro/mame2003-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/mame2003-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Late 2003 version of MAME (0.78) for libretro"
 
 PKG_LIBNAME="mame2003_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="MAME2003_LIB"
 
 configure_target() {
-  export LD="$CC"
+  export LD="${CC}"
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-mame2003_plus/package.mk b/packages/emulation/libretro-mame2003_plus/package.mk
index c440820462..615f0cdd4f 100644
--- a/packages/emulation/libretro-mame2003_plus/package.mk
+++ b/packages/emulation/libretro-mame2003_plus/package.mk
@@ -6,20 +6,20 @@ PKG_VERSION="3b43072a9ef4471508d92531e606d4e2c3dac3f6"
 PKG_SHA256="13b197f2d83f8a2adb091214455f1c6ea784eae96c3347ace645cf5bd4d89f69"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame2003-plus-libretro"
-PKG_URL="https://github.com/libretro/mame2003-plus-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/mame2003-plus-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Updated 2018 version of MAME (0.78) with added game support plus many fixes and improvements"
 
 PKG_LIBNAME="mame2003_plus_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="MAME2003_PLUS_LIB"
 
 configure_target() {
-  export LD="$CC"
+  export LD="${CC}"
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-mame2010/package.mk b/packages/emulation/libretro-mame2010/package.mk
index 9859947f43..3231c45860 100644
--- a/packages/emulation/libretro-mame2010/package.mk
+++ b/packages/emulation/libretro-mame2010/package.mk
@@ -6,28 +6,28 @@ PKG_VERSION="2d2e86b5d8dced24a390bbb3b44d913833a1f6fa"
 PKG_SHA256="5a084d988b314b9cbfc3e697f330f0a436a572481ca66ce91b0b7baafb37a8b7"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame2010-libretro"
-PKG_URL="https://github.com/libretro/mame2010-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/mame2010-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain zlib"
 PKG_LONGDESC="Late 2010 version of MAME (0.139) for libretro"
 
 PKG_LIBNAME="mame2010_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="MAME2010_LIB"
 
 pre_configure_target() {
-  export CFLAGS="$CFLAGS -fpermissive"
-  export CXXFLAGS="$CXXFLAGS -fpermissive"
-  export LD="$CXX"
+  export CFLAGS="${CFLAGS} -fpermissive"
+  export CXXFLAGS="${CXXFLAGS} -fpermissive"
+  export LD="${CXX}"
 
-  case $TARGET_CPU in
+  case ${TARGET_CPU} in
     arm1176jzf-s)
-      PKG_MAKE_OPTS_TARGET="platform=armv6-hardfloat-$TARGET_CPU"
+      PKG_MAKE_OPTS_TARGET="platform=armv6-hardfloat-${TARGET_CPU}"
       ;;
     cortex-a7|cortex-a8|cortex-a9)
-      PKG_MAKE_OPTS_TARGET="platform=armv7-neon-hardfloat-$TARGET_CPU"
+      PKG_MAKE_OPTS_TARGET="platform=armv7-neon-hardfloat-${TARGET_CPU}"
       ;;
     *cortex-a53|cortex-a17)
-      if [ "$TARGET_ARCH" = "aarch64" ]; then
+      if [ "${TARGET_ARCH}" = "aarch64" ]; then
         PKG_MAKE_OPTS_TARGET="platform=aarch64"
       else
         PKG_MAKE_OPTS_TARGET="platform=armv7-neon-hardfloat-cortex-a9"
@@ -42,7 +42,7 @@ pre_make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-mame2016/package.mk b/packages/emulation/libretro-mame2016/package.mk
index bb76d635ef..f0facf2412 100644
--- a/packages/emulation/libretro-mame2016/package.mk
+++ b/packages/emulation/libretro-mame2016/package.mk
@@ -23,9 +23,9 @@ pre_make_target() {
     TARGET="mame" SUBTARGET="arcade" PLATFORM="${ARCH}" RETRO=1 OSD="retro" \
     GIT_VERSION=${PKG_VERSION:0:7}"
 
-  if [ "$ARCH" = "arm" ]; then
+  if [ "${ARCH}" = "arm" ]; then
     PKG_MAKE_OPTS_TARGET+=" NOASM="1" ARCHITECTURE="""
-  elif [ "$ARCH" = "x86_64" ]; then
+  elif [ "${ARCH}" = "x86_64" ]; then
     PKG_MAKE_OPTS_TARGET+=" NOASM="0" PTR64="1""
   fi
 }
diff --git a/packages/emulation/libretro-melonds/package.mk b/packages/emulation/libretro-melonds/package.mk
index 09b5bb218e..578da66394 100644
--- a/packages/emulation/libretro-melonds/package.mk
+++ b/packages/emulation/libretro-melonds/package.mk
@@ -6,21 +6,21 @@ PKG_VERSION="289d544859e6abfab855f6208052bef0bf4a4592"
 PKG_SHA256="35fe3e54f8acbfbab7b064dd425a0dcdb25176d5f5ac291b2033d094ab911b72"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/melonds"
-PKG_URL="https://github.com/libretro/melonds/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/melonds/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="libretro wrapper for melonDS DS emulator."
 PKG_TOOLCHAIN="make"
 
 PKG_LIBNAME="melonds_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="MELONDS_LIB"
 
 configure_target() {
-  cd $PKG_BUILD
+  cd ${PKG_BUILD}
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-mesen/package.mk b/packages/emulation/libretro-mesen/package.mk
index 643770d661..669eae5df8 100644
--- a/packages/emulation/libretro-mesen/package.mk
+++ b/packages/emulation/libretro-mesen/package.mk
@@ -6,13 +6,13 @@ PKG_VERSION="86326e832974d984846ae078e568c023a5f76f1f"
 PKG_SHA256="50687bfd9fb242c878a420cb44a74e9bc9503bfd43f2e47f6d345cf5d8fca249"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/SourMesen/Mesen/"
-PKG_URL="https://github.com/SourMesen/Mesen/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/SourMesen/Mesen/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.mesen: mesen for Kodi"
 PKG_TOOLCHAIN="make"
 
 PKG_LIBNAME="mesen_libretro.so"
-PKG_LIBPATH="Libretro/$PKG_LIBNAME"
+PKG_LIBPATH="Libretro/${PKG_LIBNAME}"
 PKG_LIBVAR="MESEN_LIB"
 
 make_target() {
@@ -20,7 +20,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-meteor/package.mk b/packages/emulation/libretro-meteor/package.mk
index 5cb6208ee9..07a3772420 100644
--- a/packages/emulation/libretro-meteor/package.mk
+++ b/packages/emulation/libretro-meteor/package.mk
@@ -6,19 +6,19 @@ PKG_VERSION="bc6bbc06f00afd69803fe30a923be9bb95c73cb6"
 PKG_SHA256="f718aa75a079539a01fad6d349afe38f06b762272d498640e29467d2f3c8b4cd"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/meteor-libretro"
-PKG_URL="https://github.com/libretro/meteor-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/meteor-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.meteor: Meteor GBA for Kodi"
 PKG_TOOLCHAIN="make"
 
 PKG_LIBNAME="meteor_libretro.so"
-PKG_LIBPATH="libretro/$PKG_LIBNAME"
+PKG_LIBPATH="libretro/${PKG_LIBNAME}"
 PKG_LIBVAR="METEOR_LIB"
 
 pre_configure_target() {
   # fails to build in subdirs
-  cd $PKG_BUILD
-  rm -rf .$TARGET_NAME
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}
 }
 
 make_target() {
@@ -26,7 +26,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-mgba/package.mk b/packages/emulation/libretro-mgba/package.mk
index 98f38c6bd6..03f26569a7 100644
--- a/packages/emulation/libretro-mgba/package.mk
+++ b/packages/emulation/libretro-mgba/package.mk
@@ -6,19 +6,19 @@ PKG_VERSION="11d194f0988178a53dbfbe20699c5fad658d39e5"
 PKG_SHA256="b4cfc4ef84f9108d9bff3aaa8265fe35ebaaeae7c5facee49f3c556c54ad34c4"
 PKG_LICENSE="MPL 2.0"
 PKG_SITE="https://github.com/libretro/mgba"
-PKG_URL="https://github.com/libretro/mgba/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/mgba/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform zlib"
 PKG_LONGDESC="game.libretro.mgba: mGBA for Kodi"
 PKG_TOOLCHAIN="make"
 
 PKG_LIBNAME="mgba_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="MGBA_LIB"
 
 pre_configure_target() {
   # fails to build in subdirs
-  cd $PKG_BUILD
-  rm -rf .$TARGET_NAME
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}
 }
 
 make_target() {
@@ -26,7 +26,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-mrboom/package.mk b/packages/emulation/libretro-mrboom/package.mk
index c459d829f6..ee89ac94e0 100644
--- a/packages/emulation/libretro-mrboom/package.mk
+++ b/packages/emulation/libretro-mrboom/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="e074bafa1fe9480df1ba412752912a2c2c454958"
 PKG_SHA256="ac337b339cb1da9d013745c72b59b84ee64d94ada8f303be671e680d50061c15"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/mrboom-libretro"
-PKG_URL="https://github.com/libretro/mrboom-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/mrboom-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.mrboom: mrboom for Kodi"
 
 PKG_LIBNAME="mrboom_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="MRBOOM_LIB"
 
 pre_make_target() {
@@ -26,7 +26,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-mupen64plus/package.mk b/packages/emulation/libretro-mupen64plus/package.mk
index 59fae24bb6..20dd1963cd 100644
--- a/packages/emulation/libretro-mupen64plus/package.mk
+++ b/packages/emulation/libretro-mupen64plus/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="b21e3292e6ff7afb954d4871362ab6e6473d680f"
 PKG_SHA256="2bc4424ac80ee03d248d261908a857dc1e0ae919704830e1629cd111a9acc91e"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mupen64plus-libretro"
-PKG_URL="https://github.com/libretro/mupen64plus-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/mupen64plus-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.mupen64plus: Mupen64Plus for Kodi"
 
 PKG_LIBNAME="mupen64plus_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="MUPEN64PLUS_LIB"
 
 make_target() {
@@ -20,13 +20,13 @@ make_target() {
     export HAVE_NEON=1
   fi
 
-  if [ -z "$DEVICE" ]; then
-    PKG_DEVICE_NAME=$PROJECT
+  if [ -z "${DEVICE}" ]; then
+    PKG_DEVICE_NAME=${PROJECT}
   else
-    PKG_DEVICE_NAME=$DEVICE
+    PKG_DEVICE_NAME=${DEVICE}
   fi
 
-  case $PKG_DEVICE_NAME in
+  case ${PKG_DEVICE_NAME} in
     RPi|RPi2)
       make platform=${PKG_DEVICE_NAME,,}
       ;;
@@ -34,8 +34,8 @@ make_target() {
       make WITH_DYNAREC=x86_64
       ;;
     *)
-      if [[ "$TARGET_CPU" = "cortex-a9" ]] || [[ "$TARGET_CPU" = *"cortex-a53" ]] || [[ "$TARGET_CPU" = "cortex-a17" ]]; then
-        if [ "$TARGET_ARCH" = "aarch64" ]; then
+      if [[ "${TARGET_CPU}" = "cortex-a9" ]] || [[ "${TARGET_CPU}" = *"cortex-a53" ]] || [[ "${TARGET_CPU}" = "cortex-a17" ]]; then
+        if [ "${TARGET_ARCH}" = "aarch64" ]; then
           make platform=aarch64
         else
           make platform=linux-gles FORCE_GLES=1 WITH_DYNAREC=arm
@@ -46,7 +46,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-nestopia/package.mk b/packages/emulation/libretro-nestopia/package.mk
index d3331caa42..af58392722 100644
--- a/packages/emulation/libretro-nestopia/package.mk
+++ b/packages/emulation/libretro-nestopia/package.mk
@@ -6,13 +6,13 @@ PKG_VERSION="02e7c03f933333bb9ce79b2c0e5ebb936a9536e2"
 PKG_SHA256="f3fd8e18899a6b46aadb4436c3b58f2aeb844d0d22ea904017dbc9c112b8fd5d"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/nestopia"
-PKG_URL="https://github.com/libretro/nestopia/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/nestopia/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.nestopia: Nestopia for Kodi"
 PKG_TOOLCHAIN="manual"
 
 PKG_LIBNAME="nestopia_libretro.so"
-PKG_LIBPATH="libretro/$PKG_LIBNAME"
+PKG_LIBPATH="libretro/${PKG_LIBNAME}"
 PKG_LIBVAR="NESTOPIA_LIB"
 
 make_target() {
@@ -20,7 +20,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-nx/package.mk b/packages/emulation/libretro-nx/package.mk
index 2bd215868e..df736a9897 100644
--- a/packages/emulation/libretro-nx/package.mk
+++ b/packages/emulation/libretro-nx/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="aad9a19b95356d91062bd3f2bc561b2139cf0b7b"
 PKG_SHA256="7da3b2c59a8ee02e831c90e08f2419b1afa6b9e1140ec16e184a2164c213f28b"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/nxengine-libretro"
-PKG_URL="https://github.com/libretro/nxengine-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/nxengine-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.nx: nx for Kodi"
 
 PKG_LIBNAME="nxengine_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="NX_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-o2em/package.mk b/packages/emulation/libretro-o2em/package.mk
index 232000087b..bd79c8c861 100644
--- a/packages/emulation/libretro-o2em/package.mk
+++ b/packages/emulation/libretro-o2em/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="51e5e19d71c5c17d87ce67a5faf60a8b77d40135"
 PKG_SHA256="de7b3e61ba978d7d793d3458002c3e247961d3dbbb91f406ce798b873c311cba"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/libretro-o2em"
-PKG_URL="https://github.com/libretro/libretro-o2em/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/libretro-o2em/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.o2em: o2em for Kodi"
 
 PKG_LIBNAME="o2em_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="O2EM_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-pcsx-rearmed/package.mk b/packages/emulation/libretro-pcsx-rearmed/package.mk
index 191247a3b3..4003f295ca 100644
--- a/packages/emulation/libretro-pcsx-rearmed/package.mk
+++ b/packages/emulation/libretro-pcsx-rearmed/package.mk
@@ -6,18 +6,18 @@ PKG_VERSION="574e2fafbf6dbee9a5cacacd97c6a18c98fbc10e"
 PKG_SHA256="e215780d44b1100d00bc2f81398027bc8783d2cae5266ba584dbc52cff1b7fb7"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/pcsx_rearmed"
-PKG_URL="https://github.com/libretro/pcsx_rearmed/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/pcsx_rearmed/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.pcsx-rearmed: PCSX Rearmed for Kodi"
 PKG_TOOLCHAIN="manual"
 PKG_BUILD_FLAGS="-gold"
 
 PKG_LIBNAME="pcsx_rearmed_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="PCSX-REARMED_LIB"
 
 make_target() {
-  cd $PKG_BUILD
+  cd ${PKG_BUILD}
   
   if target_has_feature neon; then
     export HAVE_NEON=1
@@ -27,23 +27,23 @@ make_target() {
   fi
 
   # check if this flag is still needed when this package is updated
-  export CFLAGS="$CFLAGS -fcommon"
+  export CFLAGS="${CFLAGS} -fcommon"
   
-  case $TARGET_ARCH in
+  case ${TARGET_ARCH} in
     aarch64)
-      make -f Makefile.libretro DYNAREC=lightrec platform=aarch64 GIT_VERSION=$PKG_VERSION
+      make -f Makefile.libretro DYNAREC=lightrec platform=aarch64 GIT_VERSION=${PKG_VERSION}
       ;;
     arm)
-      make -f Makefile.libretro DYNAREC=ari64 GIT_VERSION=$PKG_VERSION
+      make -f Makefile.libretro DYNAREC=ari64 GIT_VERSION=${PKG_VERSION}
       ;;
     x86_64)
-      make -f Makefile.libretro DYNAREC=lightrec GIT_VERSION=$PKG_VERSION
+      make -f Makefile.libretro DYNAREC=lightrec GIT_VERSION=${PKG_VERSION}
       ;;
   esac
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-picodrive/package.mk b/packages/emulation/libretro-picodrive/package.mk
index 15f0e70847..8a2ccab618 100644
--- a/packages/emulation/libretro-picodrive/package.mk
+++ b/packages/emulation/libretro-picodrive/package.mk
@@ -6,38 +6,38 @@ PKG_VERSION="67cdfb8c5d407c5a4e8f25ffa0ee7fac716b0690"
 PKG_SHA256="39871c4c5d2af833a4ae56ef83cfe21102edc563b728f00c56d50de9857cbf1e"
 PKG_LICENSE="MAME"
 PKG_SITE="https://github.com/libretro/picodrive"
-PKG_URL="https://github.com/libretro/picodrive/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/picodrive/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain kodi-platform $PKG_NAME:host"
+PKG_DEPENDS_TARGET="toolchain kodi-platform ${PKG_NAME}:host"
 PKG_DEPENDS_UNPACK="cyclone68000"
 PKG_LONGDESC="Fast MegaDrive/MegaCD/32X emulator"
 PKG_TOOLCHAIN="manual"
 PKG_BUILD_FLAGS="-gold"
 
 PKG_LIBNAME="picodrive_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="PICODRIVE_LIB"
 
 pre_build_host() {
-  cp -a $(get_build_dir cyclone68000)/* $PKG_BUILD/cpu/cyclone/
+  cp -a $(get_build_dir cyclone68000)/* ${PKG_BUILD}/cpu/cyclone/
 }
 
 pre_configure_host() {
   # fails to build in subdirs
-  cd $PKG_BUILD
-  rm -rf .$HOST_NAME
+  cd ${PKG_BUILD}
+  rm -rf .${HOST_NAME}
 }
 
 make_host() {
-  if [ "$ARCH" = "arm" ]; then
+  if [ "${ARCH}" = "arm" ]; then
     make -C cpu/cyclone CONFIG_FILE=../cyclone_config.h
   fi
 }
 
 pre_configure_target() {
   # fails to build in subdirs
-  cd $PKG_BUILD
-  rm -rf .$TARGET_NAME
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}
 }
 
 post_configure_target() {
@@ -49,7 +49,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-pokemini/package.mk b/packages/emulation/libretro-pokemini/package.mk
index 17d9d2985c..569fba92a7 100644
--- a/packages/emulation/libretro-pokemini/package.mk
+++ b/packages/emulation/libretro-pokemini/package.mk
@@ -6,21 +6,21 @@ PKG_VERSION="87163ef02126f73c93b7e55badd7d6d66e12a304"
 PKG_SHA256="64d5db160d39fc79a26d81c1c41a9d8085747fe37eceb3c93d6efb39044f6299"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/pokemini"
-PKG_URL="https://github.com/libretro/pokemini/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/pokemini/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="libretro wrapper for PokeMini emulator."
 PKG_TOOLCHAIN="make"
 
 PKG_LIBNAME="pokemini_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="POKEMINI_LIB"
 
 configure_target() {
-  cd $PKG_BUILD
+  cd ${PKG_BUILD}
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-ppsspp/package.mk b/packages/emulation/libretro-ppsspp/package.mk
index 4287a46139..20b9d23945 100644
--- a/packages/emulation/libretro-ppsspp/package.mk
+++ b/packages/emulation/libretro-ppsspp/package.mk
@@ -6,13 +6,13 @@ PKG_VERSION="7b4ddb426bbe9e287bb7f19b0cfaebb4ea0d41d8"
 PKG_SHA256="e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain SDL2"
 PKG_LONGDESC="A PSP emulator written in C++."
 PKG_TOOLCHAIN="cmake-make"
 
 PKG_LIBNAME="ppsspp_libretro.so"
-PKG_LIBPATH="lib/$PKG_LIBNAME"
+PKG_LIBPATH="lib/${PKG_LIBNAME}"
 PKG_LIBVAR="PPSSPP_LIB"
 
 if target_has_feature neon; then
@@ -25,10 +25,10 @@ fi
 
 PKG_CMAKE_OPTS_TARGET="-DLIBRETRO=ON \
                        -DUSE_SYSTEM_FFMPEG=ON \
-                       $PKG_ARCH_ARM"
+                       ${PKG_ARCH_ARM}"
 
 pre_configure_target() {
-  LDFLAGS="$LDFLAGS -lpthread"
+  LDFLAGS+=" -lpthread"
 }
 
 pre_make_target() {
@@ -36,7 +36,7 @@ pre_make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-prboom/package.mk b/packages/emulation/libretro-prboom/package.mk
index 0ff59379a7..b4c41fdb06 100644
--- a/packages/emulation/libretro-prboom/package.mk
+++ b/packages/emulation/libretro-prboom/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="0f553228c1c980fb75acb566e35e3e17ea477ee3"
 PKG_SHA256="999a8d31b9372896d4bf6833424b34cdef0c29ff3f53f135ac61622c4e61fd42"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/libretro-prboom"
-PKG_URL="https://github.com/libretro/libretro-prboom/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/libretro-prboom/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.prboom: prboom for Kodi"
 
 PKG_LIBNAME="prboom_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="PRBOOM_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-prosystem/package.mk b/packages/emulation/libretro-prosystem/package.mk
index 5bf806cb55..1052ebb336 100644
--- a/packages/emulation/libretro-prosystem/package.mk
+++ b/packages/emulation/libretro-prosystem/package.mk
@@ -6,16 +6,16 @@ PKG_VERSION="95f2094b915afb502f74d921aceaf7db7e63a01c"
 PKG_SHA256="3a9950d87c63b1ff98f168bff99bde037b49a49dfc03d9c5ebd3e56fb701e889"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/prosystem-libretro"
-PKG_URL="https://github.com/libretro/prosystem-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/prosystem-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="Port of ProSystem to libretro"
 
 PKG_LIBNAME="prosystem_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="PROSYSTEM_LIB"
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-quicknes/package.mk b/packages/emulation/libretro-quicknes/package.mk
index f86c150a97..bba5852be8 100644
--- a/packages/emulation/libretro-quicknes/package.mk
+++ b/packages/emulation/libretro-quicknes/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="55d47ca526e7d8585e321b9d99cc2ac3796bd230"
 PKG_SHA256="463ba5a604df399286b2b8a092a9933e3633e96ec01e177a5027f6907176748f"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/QuickNES_Core"
-PKG_URL="https://github.com/libretro/QuickNES_Core/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/QuickNES_Core/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.quicknes: QuickNES for Kodi"
 
 PKG_LIBNAME="quicknes_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="QUICKNES_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-reicast/package.mk b/packages/emulation/libretro-reicast/package.mk
index a9be208bd2..4c68fd4b48 100644
--- a/packages/emulation/libretro-reicast/package.mk
+++ b/packages/emulation/libretro-reicast/package.mk
@@ -6,24 +6,24 @@ PKG_VERSION="9d6f80ee347f99a7a8162032de59834e03b64016"
 PKG_SHA256="94b20bb11d17b987a15a06f67cd87ae8957c6c1a71b07c1cbc2bceb045226d4c"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/reicast-emulator"
-PKG_URL="https://github.com/libretro/reicast-emulator/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/reicast-emulator/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="Reicast is a multiplatform Sega Dreamcast emulator"
 
 PKG_LIBNAME="reicast_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="REICAST_LIB"
 
 make_target() {
-  if [ "$DEVICE" = "RPi2" ]; then
+  if [ "${DEVICE}" = "RPi2" ]; then
     make platform=${DEVICE,,}
   else
-    case $TARGET_CPU in
+    case ${TARGET_CPU} in
       arm1176jzf-s)
         make platform=arm FORCE_GLES=1
         ;;
       cortex-a7|cortex-a9)
-        make platform=armv7-neon-hardfloat-$TARGET_CPU FORCE_GLES=1
+        make platform=armv7-neon-hardfloat-${TARGET_CPU} FORCE_GLES=1
         ;;
       x86-64)
         make
@@ -33,7 +33,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-sameboy/package.mk b/packages/emulation/libretro-sameboy/package.mk
index 17bede0d13..3795f90ce4 100644
--- a/packages/emulation/libretro-sameboy/package.mk
+++ b/packages/emulation/libretro-sameboy/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="699dcd7d16ad0ed35ad727e18bb53d6bf4b091ca"
 PKG_SHA256="f5dc6d62494f88ee20ad24af52079a8ac595a34703d2097341b828bb19dd625f"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/libretro/sameboy"
-PKG_URL="https://github.com/libretro/sameboy/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/sameboy/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="libretro wrapper for SameBoy emulator."
 
 PKG_LIBNAME="sameboy_libretro.so"
-PKG_LIBPATH="libretro/$PKG_LIBNAME"
+PKG_LIBPATH="libretro/${PKG_LIBNAME}"
 PKG_LIBVAR="SAMEBOY_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-scummvm/package.mk b/packages/emulation/libretro-scummvm/package.mk
index bea86c6872..da5599834f 100644
--- a/packages/emulation/libretro-scummvm/package.mk
+++ b/packages/emulation/libretro-scummvm/package.mk
@@ -6,26 +6,26 @@ PKG_VERSION="7b1e9299057a01a1defad6dbae4bdbeed36aa767"
 PKG_SHA256="a2dd4c2913c88fd2f0f1ef8eb5d84734d86c3a73313e734380a95ae6b8e2de9b"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/scummvm"
-PKG_URL="https://github.com/libretro/scummvm/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/scummvm/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.scummvm: scummvm for Kodi"
 PKG_TOOLCHAIN="make"
 
 PKG_LIBNAME="scummvm_libretro.so"
-PKG_LIBPATH="backends/platform/libretro/build/$PKG_LIBNAME"
+PKG_LIBPATH="backends/platform/libretro/build/${PKG_LIBNAME}"
 PKG_LIBVAR="SCUMMVM_LIB"
 
 PKG_MAKE_OPTS_TARGET="-C backends/platform/libretro/build/"
 
 pre_make_target() {
-  cd $PKG_BUILD
+  cd ${PKG_BUILD}
   CXXFLAGS+=" -DHAVE_POSIX_MEMALIGN=1"
   export AR+=" cru"
-  export LD="$CC"
+  export LD="${CC}"
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-snes9x/package.mk b/packages/emulation/libretro-snes9x/package.mk
index 73d72f19fe..0ac7dc557e 100644
--- a/packages/emulation/libretro-snes9x/package.mk
+++ b/packages/emulation/libretro-snes9x/package.mk
@@ -6,13 +6,13 @@ PKG_VERSION="975aecb88830e6719e267e38144da47eb707fbac"
 PKG_SHA256="caa4fa80eac5a873452b980865103dd96a90779392e84d0cdcdfadd35fc89cb6"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/snes9x"
-PKG_URL="https://github.com/libretro/snes9x/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/snes9x/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.snes9x: snes9x for Kodi"
 PKG_TOOLCHAIN="manual"
 
 PKG_LIBNAME="snes9x_libretro.so"
-PKG_LIBPATH="libretro/$PKG_LIBNAME"
+PKG_LIBPATH="libretro/${PKG_LIBNAME}"
 PKG_LIBVAR="SNES9X_LIB"
 
 make_target() {
@@ -20,7 +20,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-snes9x2002/package.mk b/packages/emulation/libretro-snes9x2002/package.mk
index 9ce928f5ac..12196f6bb1 100644
--- a/packages/emulation/libretro-snes9x2002/package.mk
+++ b/packages/emulation/libretro-snes9x2002/package.mk
@@ -7,20 +7,20 @@ PKG_SHA256="7b505900ab3a46bc7c9de76c0e564589978be63f391a51cff046f8b49e84c7f2"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/snes9x2002"
-PKG_URL="https://github.com/libretro/snes9x2002/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/snes9x2002/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="Port of SNES9x 1.39 for libretro. Heavily optimized for ARM."
 
 PKG_LIBNAME="snes9x2002_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="SNES9X2002_LIB"
 
 pre_make_target() {
-  export CFLAGS="$CFLAGS -std=gnu11"
+  export CFLAGS="${CFLAGS} -std=gnu11"
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-snes9x2010/package.mk b/packages/emulation/libretro-snes9x2010/package.mk
index cca127dc85..bccfea52fd 100644
--- a/packages/emulation/libretro-snes9x2010/package.mk
+++ b/packages/emulation/libretro-snes9x2010/package.mk
@@ -6,16 +6,16 @@ PKG_VERSION="5b70b056e27b360684869470a7143294865b7f05"
 PKG_SHA256="39b9af85d459730a0f292913ab26567dd95485ae33a8ec0294d224e6b4096b60"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/snes9x2010"
-PKG_URL="https://github.com/libretro/snes9x2010/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/snes9x2010/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="snes9x2010 for Kodi"
 
 PKG_LIBNAME="snes9x2010_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="SNES9X2010_LIB"
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-stella/package.mk b/packages/emulation/libretro-stella/package.mk
index 7dd3ae042b..b71f159707 100644
--- a/packages/emulation/libretro-stella/package.mk
+++ b/packages/emulation/libretro-stella/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="b4b4cf3266ce6dc8ed891978761209272000009c"
 PKG_SHA256="c02a1708deb97450e25ae0c04c0c0fea17a19d51fa954f2308ca0cad637ae7a5"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/stella-libretro"
-PKG_URL="https://github.com/libretro/stella-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/stella-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.stella: Stella for Kodi"
 
 PKG_LIBNAME="stella2014_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="STELLA_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-tgbdual/package.mk b/packages/emulation/libretro-tgbdual/package.mk
index e956a2994e..414be517b7 100644
--- a/packages/emulation/libretro-tgbdual/package.mk
+++ b/packages/emulation/libretro-tgbdual/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="b1fd9280dc89733ecdfb45d7d24b65e5e30f74a5"
 PKG_SHA256="246dd68382a6b87be3001decbfef4c4ba6e9b209948ec22c7cf3ba94a5ddfd2f"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/tgbdual-libretro"
-PKG_URL="https://github.com/libretro/tgbdual-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/tgbdual-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.tgbdual: tgbdual for Kodi"
 
 PKG_LIBNAME="tgbdual_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="TGBDUAL_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-tyrquake/package.mk b/packages/emulation/libretro-tyrquake/package.mk
index 91e0b1a71f..b681dbef0e 100644
--- a/packages/emulation/libretro-tyrquake/package.mk
+++ b/packages/emulation/libretro-tyrquake/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="d2c077f0d28f9b8e4e74032787efef57fc540996"
 PKG_SHA256="26330f2c6ce2f25ffe1644d8d86e0ed311754169f5a359ba5fbaf2b4ef716aef"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/tyrquake"
-PKG_URL="https://github.com/libretro/tyrquake/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/tyrquake/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.tyrquake: tyrquake for Kodi"
 
 PKG_LIBNAME="tyrquake_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="TYRQUAKE_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-uae/package.mk b/packages/emulation/libretro-uae/package.mk
index 4b0872ea4d..a5c281b5ef 100644
--- a/packages/emulation/libretro-uae/package.mk
+++ b/packages/emulation/libretro-uae/package.mk
@@ -6,24 +6,24 @@ PKG_VERSION="4e85b3df50dac612e4ea301dbb019b734b5ece6e"
 PKG_SHA256="95e402199e26e83f7cfcf4e6c8e709054f2ca5d2b662800a4b85f3c3bce21988"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/libretro-uae"
-PKG_URL="https://github.com/libretro/libretro-uae/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/libretro-uae/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="libretro wrapper for UAE emulator."
 PKG_BUILD_FLAGS="-lto"
 
 PKG_LIBNAME="puae_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="UAE_LIB"
 
 pre_configure_target() {
-  CFLAGS="$CFLAGS -fcommon"
-  if [ "$TARGET_ARCH" = "arm" ]; then
-    CFLAGS="$CFLAGS -DARM -marm"
+  CFLAGS+=" -fcommon"
+  if [ "${TARGET_ARCH}" = "arm" ]; then
+    CFLAGS+=" -DARM -marm"
   fi
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-uae4arm/package.mk b/packages/emulation/libretro-uae4arm/package.mk
index 28394b7e6a..1d0f915fca 100644
--- a/packages/emulation/libretro-uae4arm/package.mk
+++ b/packages/emulation/libretro-uae4arm/package.mk
@@ -7,17 +7,17 @@ PKG_SHA256="ccc989c75c11cbc1be96b917cadc3551b5fb8710f2a203f2ce86c46196229a4a"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/uae4arm-libretro"
-PKG_URL="https://github.com/libretro/uae4arm-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/uae4arm-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain zlib"
 PKG_LONGDESC="UAE4ARM amiga emulator."
 
 PKG_LIBNAME="uae4arm_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="UAE4ARM_LIB"
 
 pre_configure_target() {
   if target_has_feature neon; then
-    CFLAGS="$CFLAGS -D__NEON_OPT"
+    CFLAGS+=" -D__NEON_OPT"
   fi
 }
 
@@ -28,11 +28,11 @@ make_target() {
     PKG_HAVE_NEON=0
   fi
 
-  make HAVE_NEON=$PKG_HAVE_NEON USE_PICASSO96=1
+  make HAVE_NEON=${PKG_HAVE_NEON} USE_PICASSO96=1
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-vba-next/package.mk b/packages/emulation/libretro-vba-next/package.mk
index 265eec69c3..93f07b8625 100644
--- a/packages/emulation/libretro-vba-next/package.mk
+++ b/packages/emulation/libretro-vba-next/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="15037175093511aab9a52e27f28989c6c6fdb674"
 PKG_SHA256="e72c17f1bfd1dabe955a0b59d9d15ef5469a4f54c0527f4320a5572aed220248"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/vba-next"
-PKG_URL="https://github.com/libretro/vba-next/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/vba-next/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.vba-next: VBA-Next for Kodi"
 
 PKG_LIBNAME="vba_next_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="VBA-NEXT_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-vbam/package.mk b/packages/emulation/libretro-vbam/package.mk
index 357b395962..021c106d2c 100644
--- a/packages/emulation/libretro-vbam/package.mk
+++ b/packages/emulation/libretro-vbam/package.mk
@@ -6,19 +6,19 @@ PKG_VERSION="26e9a6e3d91fce2380ef128bf23e52fb3be2bce1"
 PKG_SHA256="d5ae8a518b413a7263b8bb2c5a1e282ea6168eeea1de3075db1e26333d847e22"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/vbam-libretro"
-PKG_URL="https://github.com/libretro/vbam-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/vbam-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.vbam: VBA-M for Kodi"
 PKG_TOOLCHAIN="make"
 
 PKG_LIBNAME="vbam_libretro.so"
-PKG_LIBPATH="src/libretro/$PKG_LIBNAME"
+PKG_LIBPATH="src/libretro/${PKG_LIBNAME}"
 PKG_LIBVAR="VBAM_LIB"
 
 pre_configure_target() {
   # fails to build in subdirs
-  cd $PKG_BUILD
-  rm -rf .$TARGET_NAME
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}
 }
 
 make_target() {
@@ -26,7 +26,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-vecx/package.mk b/packages/emulation/libretro-vecx/package.mk
index 72ec6156ed..4b8c81d09c 100644
--- a/packages/emulation/libretro-vecx/package.mk
+++ b/packages/emulation/libretro-vecx/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="7f8d42e0f5e891997afa72a639dbcc0f3be710c6"
 PKG_SHA256="ca151780c41b687056c7a1a4616516846e8a174dd6a561653296cb2a5b854fb1"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/libretro-vecx"
-PKG_URL="https://github.com/libretro/libretro-vecx/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/libretro-vecx/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.vecx: vecx for Kodi"
 
 PKG_LIBNAME="vecx_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="VECX_LIB"
 
 make_target() {
@@ -19,7 +19,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-vice/package.mk b/packages/emulation/libretro-vice/package.mk
index 95ddaaf19d..e5ff604345 100644
--- a/packages/emulation/libretro-vice/package.mk
+++ b/packages/emulation/libretro-vice/package.mk
@@ -6,24 +6,24 @@ PKG_VERSION="ba666e1d5ef0fbfd8f569ea446fbda831bf03c9a"
 PKG_SHA256="5cde31a1ba3ecc05217781572c4ed9a7f47816f71ce16723b21458d5ac4905ba"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/vice-libretro"
-PKG_URL="https://github.com/libretro/vice-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/vice-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="VICE C64 libretro"
 
 PKG_LIBNAME="vice_x64_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="VICE_LIB"
 
 pre_build_target() {
-  export GIT_VERSION=$PKG_VERSION
+  export GIT_VERSION=${PKG_VERSION}
 }
 
 make_target() {
-  make -f Makefile.libretro CC=$CC
+  make -f Makefile.libretro CC=${CC}
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-virtualjaguar/package.mk b/packages/emulation/libretro-virtualjaguar/package.mk
index 6d1ab49ffb..b44ebae3d9 100644
--- a/packages/emulation/libretro-virtualjaguar/package.mk
+++ b/packages/emulation/libretro-virtualjaguar/package.mk
@@ -6,16 +6,16 @@ PKG_VERSION="575371decc78b186273146126140268c3efb7ce4"
 PKG_SHA256="110933269a6f6e607101399c8c70a9a990d3f0d9c2d53b9daab5ec398360f80e"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/virtualjaguar-libretro"
-PKG_URL="https://github.com/libretro/virtualjaguar-libretro/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/virtualjaguar-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="Port of Virtual Jaguar to Libretro"
 
 PKG_LIBNAME="virtualjaguar_libretro.so"
-PKG_LIBPATH="$PKG_LIBNAME"
+PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="VIRTUALJAGUAR_LIB"
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-vram-test/package.mk b/packages/emulation/libretro-vram-test/package.mk
index b65f518f7b..bda84fc1a8 100644
--- a/packages/emulation/libretro-vram-test/package.mk
+++ b/packages/emulation/libretro-vram-test/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="6b90ce965b08cc1d6a94b4f3916b5114167db498"
 PKG_SHA256="2bd1b3af783a028355eb4b4c416f09802313a9a69759e716377b55012f7bb4ae"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/libretro/libretro-samples"
-PKG_URL="https://github.com/libretro/libretro-samples/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/libretro-samples/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="VRAM Test from libretro"
 PKG_TOOLCHAIN="manual"
@@ -15,16 +15,16 @@ PKG_LIBNAME="testsw_vram_libretro.so"
 PKG_LIBVAR="VRAM-TEST_LIB"
 
 configure_package() {
-  PKG_LIBPATH="$PKG_BUILD/video/software/rendering_direct_to_vram/$PKG_LIBNAME"
+  PKG_LIBPATH="${PKG_BUILD}/video/software/rendering_direct_to_vram/${PKG_LIBNAME}"
 }
 
 make_target() {
-  cd $PKG_BUILD/video/software/rendering_direct_to_vram
+  cd ${PKG_BUILD}/video/software/rendering_direct_to_vram
   make
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }
diff --git a/packages/emulation/libretro-yabause/package.mk b/packages/emulation/libretro-yabause/package.mk
index 64c9e7ab2f..58e0df78d9 100644
--- a/packages/emulation/libretro-yabause/package.mk
+++ b/packages/emulation/libretro-yabause/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="f515e5a49336195c61b751e539aadae72fbe0aa7"
 PKG_SHA256="c76134a37e6cb1e20579b257ce8b119f6edde64a080db7320f81d076db5fcd74"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/yabause"
-PKG_URL="https://github.com/libretro/yabause/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libretro/yabause/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_LONGDESC="game.libretro.yabause: Yabause for Kodi"
 PKG_TOOLCHAIN="make"
@@ -32,8 +32,8 @@ pre_make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME
-  cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME
-  echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
+  cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}
+  echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake
 }