diff --git a/packages/3rdparty/multimedia/vdr-control/package.mk b/packages/3rdparty/multimedia/vdr-control/package.mk
index a8ee16f2ba..39b005bc22 100644
--- a/packages/3rdparty/multimedia/vdr-control/package.mk
+++ b/packages/3rdparty/multimedia/vdr-control/package.mk
@@ -36,17 +36,19 @@ PKG_LONGDESC="vdr control plugin"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
-PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
-                      LIBDIR=\".\" \
-                      LOCALEDIR=\"./locale\""
-
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC"
   export CXXFLAGS="$CXXFLAGS -fPIC"
   export LDFLAGS="$LDFLAGS -fPIC"
 }
 
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
 makeinstall_target() {
   : # installation not needed, done by create-addon script
 }
diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/package.mk b/packages/3rdparty/multimedia/vdr-epgsearch/package.mk
index 75145b3a91..9870e24c17 100644
--- a/packages/3rdparty/multimedia/vdr-epgsearch/package.mk
+++ b/packages/3rdparty/multimedia/vdr-epgsearch/package.mk
@@ -36,17 +36,19 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
-PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
-                      LIBDIR=\".\" \
-                      LOCALEDIR=\"./locale\""
-
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
   export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
   export LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 }
 
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
 makeinstall_target() {
   : # installation not needed, done by create-addon script
 }
diff --git a/packages/3rdparty/multimedia/vdr-iptv/package.mk b/packages/3rdparty/multimedia/vdr-iptv/package.mk
index c058b96e6a..065215a52f 100644
--- a/packages/3rdparty/multimedia/vdr-iptv/package.mk
+++ b/packages/3rdparty/multimedia/vdr-iptv/package.mk
@@ -36,17 +36,19 @@ PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
-PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
-                      LIBDIR=\".\" \
-                      LOCALEDIR=\"./locale\""
-
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC"
   export CXXFLAGS="$CXXFLAGS -fPIC"
   export LDFLAGS="$LDFLAGS -fPIC"
 }
 
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
 makeinstall_target() {
   : # installation not needed, done by create-addon script
 }
diff --git a/packages/3rdparty/multimedia/vdr-live/package.mk b/packages/3rdparty/multimedia/vdr-live/package.mk
index 82af8f2cb9..a2fdc7de46 100644
--- a/packages/3rdparty/multimedia/vdr-live/package.mk
+++ b/packages/3rdparty/multimedia/vdr-live/package.mk
@@ -36,11 +36,6 @@ PKG_LONGDESC="vdr-live allows a comfortable operation of VDR and some of its plu
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
-PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
-                      LIBDIR=\".\" \
-                      LOCALEDIR=\"./locale\""
-
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
   export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
@@ -52,6 +47,13 @@ pre_make_target() {
   MAKEFLAGS=-j1
 }
 
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
 makeinstall_target() {
   : # installation not needed, done by create-addon script
 }
diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk
index aad7542bb9..d8c225953c 100644
--- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk
+++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk
@@ -36,13 +36,6 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
-PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
-                      VDRSRC=$ROOT/$BUILD/$VDR_DIR \
-                      LIBDIR=\".\" \
-                      LOCALEDIR=\"./locale\" \
-                      LIBDVBCSA=1"
-
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC"
   export CXXFLAGS="$CXXFLAGS -fPIC"
@@ -55,6 +48,15 @@ pre_make_target() {
   MAKEFLAGS=-j1
 }
 
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    VDRSRC=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale" \
+    LIBDVBCSA=1
+}
+
 makeinstall_target() {
   : # installation not needed, done by create-addon script
 }
diff --git a/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk b/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk
index 5e986d1c05..638695fe0c 100644
--- a/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk
+++ b/packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk
@@ -36,17 +36,19 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
-PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
-                      LIBDIR=\".\" \
-                      LOCALEDIR=\"./locale\""
-
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC"
   export CXXFLAGS="$CXXFLAGS -fPIC"
   export LDFLAGS="$LDFLAGS -fPIC"
 }
 
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
 makeinstall_target() {
   : # installation not needed, done by create-addon script
 }
diff --git a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk
index d86da0243f..2afda97f69 100644
--- a/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk
+++ b/packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk
@@ -36,16 +36,19 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
-PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
-                      LIBDIR=\".\" \
-                      LOCALEDIR=\"./locale\""
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC"
   export CXXFLAGS="$CXXFLAGS -fPIC"
   export LDFLAGS="$LDFLAGS -fPIC"
 }
 
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
 makeinstall_target() {
   : # installation not needed, done by create-addon script
 }
diff --git a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk
index e777cff437..f3f1ce5c44 100644
--- a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk
+++ b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk
@@ -36,17 +36,19 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
-PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
-                      LIBDIR=\".\" \
-                      LOCALEDIR=\"./locale\""
-
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC"
   export CXXFLAGS="$CXXFLAGS -fPIC"
   export LDFLAGS="$LDFLAGS -fPIC"
 }
 
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
 post_make_target() {
   cd dist/epgdata2xmltv
   make -j1
diff --git a/packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk b/packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk
index aca1ceb0eb..51a45ba7fa 100644
--- a/packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk
+++ b/packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk
@@ -36,10 +36,12 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
-PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
-                      LIBDIR=\".\" \
-                      LOCALEDIR=\"./locale\""
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
 
 makeinstall_target() {
   : # installation not needed, done by create-addon script
diff --git a/packages/3rdparty/multimedia/vdr-sc/package.mk b/packages/3rdparty/multimedia/vdr-sc/package.mk
index c9be34e33c..885eb75349 100644
--- a/packages/3rdparty/multimedia/vdr-sc/package.mk
+++ b/packages/3rdparty/multimedia/vdr-sc/package.mk
@@ -36,11 +36,6 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
-PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
-                      LIBDIR=\".\" \
-                      LOCALEDIR=\"./locale\""
-
 pre_make_target() {
   # dont build parallel
   MAKEFLAGS=-j1
@@ -55,6 +50,13 @@ pre_configure_target() {
   export CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
 }
 
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
 makeinstall_target() {
   : # installation not needed, done by create-addon script
 }
diff --git a/packages/3rdparty/multimedia/vdr-wirbelscan/package.mk b/packages/3rdparty/multimedia/vdr-wirbelscan/package.mk
index 21a7dabd3c..fbda828796 100644
--- a/packages/3rdparty/multimedia/vdr-wirbelscan/package.mk
+++ b/packages/3rdparty/multimedia/vdr-wirbelscan/package.mk
@@ -36,17 +36,19 @@ PKG_LONGDESC="TV"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
-PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
-                      LIBDIR=\".\" \
-                      LOCALEDIR=\"./locale\""
-
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC"
   export CXXFLAGS="$CXXFLAGS -fPIC"
   export LDFLAGS="$LDFLAGS -fPIC"
 }
 
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
 makeinstall_target() {
   : # installation not needed, done by create-addon script
 }
diff --git a/packages/3rdparty/multimedia/vdr-wirbelscancontrol/package.mk b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/package.mk
index 29a5efecb6..6e4c47b005 100644
--- a/packages/3rdparty/multimedia/vdr-wirbelscancontrol/package.mk
+++ b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/package.mk
@@ -37,11 +37,6 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
-PKG_MAKE_OPTS_TARGET="VDRDIR=$ROOT/$BUILD/$VDR_DIR \
-                      LIBDIR=\".\" \
-                      LOCALEDIR=\"./locale\""
-
 pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC"
   export CXXFLAGS="$CXXFLAGS -fPIC"
@@ -49,7 +44,15 @@ pre_configure_target() {
 }
 
 pre_build_target() {
-  ln -sf $ROOT/$BUILD/vdr-wirbelscan-[0-9]*/wirbelscan_services.h $PKG_BUILD
+  WIRBELSCAN_DIR=$(get_build_dir vdr-wirbelscan)
+  ln -sf $WIRBELSCAN_DIR/wirbelscan_services.h $PKG_BUILD
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
 }
 
 makeinstall_target() {