diff --git a/admin/monit/Makefile b/admin/monit/Makefile
index 76cf8e5a0c..1c7d7195a3 100644
--- a/admin/monit/Makefile
+++ b/admin/monit/Makefile
@@ -14,7 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://mmonit.com/monit/dist
 PKG_HASH:=87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=AGPL-3.0
 PKG_LICENSE_FILES:=COPYING
diff --git a/admin/openwisp-config/Makefile b/admin/openwisp-config/Makefile
index a109de1795..143475f174 100644
--- a/admin/openwisp-config/Makefile
+++ b/admin/openwisp-config/Makefile
@@ -8,7 +8,6 @@ PKG_NAME:=openwisp-config
 PKG_VERSION:=0.4.5
 PKG_RELEASE:=2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/openwisp/openwisp-config.git
diff --git a/lang/lpeg/Makefile b/lang/lpeg/Makefile
index 03f8c7656a..5d56fb2614 100644
--- a/lang/lpeg/Makefile
+++ b/lang/lpeg/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.inf.puc-rio.br/~roberto/lpeg/
 PKG_HASH:=6aad270b91d1b1c6fd75f68e162329a04a644e50e917d55f46cc8384b7120004
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/lpeg
diff --git a/lang/lua-cjson/Makefile b/lang/lua-cjson/Makefile
index aea91a535e..de727346a8 100644
--- a/lang/lua-cjson/Makefile
+++ b/lang/lua-cjson/Makefile
@@ -18,7 +18,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.kyne.com.au/~mark/software/download/
 PKG_HASH:=51bc69cd55931e0cba2ceae39e9efa2483f4292da3a88a1ed470eda829f6c778
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 HOST_BUILD_DEPENDS:=lua/host
 
 include $(INCLUDE_DIR)/host-build.mk
diff --git a/lang/lua-libmodbus/Makefile b/lang/lua-libmodbus/Makefile
index 8fd42b40a6..12e599a7c6 100644
--- a/lang/lua-libmodbus/Makefile
+++ b/lang/lua-libmodbus/Makefile
@@ -13,8 +13,6 @@ PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 PKG_MAINTAINER:=Karl Palsson <karlp@etactica.com>
 PKG_LICENSE:=MIT
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/lua-libmodbus-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/lua-libmodbus
diff --git a/lang/luasql/Makefile b/lang/luasql/Makefile
index 5355a824a9..baea0c166d 100644
--- a/lang/luasql/Makefile
+++ b/lang/luasql/Makefile
@@ -14,7 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/keplerproject/luasql/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=db2458a8c8c5f3bc717e4030fe2878f1ad8d71e437ec6149c381eebad5d525c5
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=MIT
diff --git a/libs/libedit/Makefile b/libs/libedit/Makefile
index 93b31a54da..e7fda1e123 100644
--- a/libs/libedit/Makefile
+++ b/libs/libedit/Makefile
@@ -18,7 +18,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thrysoee.dk/editline/
 PKG_HASH:=2811d70c0b000f2ca91b7cb1a37203134441743c4fcc9c37b0b687f328611064
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/libs/libshout/Makefile b/libs/libshout/Makefile
index 8790fdff25..ea1d9db83c 100644
--- a/libs/libshout/Makefile
+++ b/libs/libshout/Makefile
@@ -12,7 +12,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.us.xiph.org/releases/libshout/
 PKG_HASH:=0d8af55d1141bf90710bcd41a768c9cc5adb251502a0af1dd22c8da215d40dfe
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=LGPL-2.0-or-later
diff --git a/libs/libuwsc/Makefile b/libs/libuwsc/Makefile
index b0c8771a71..08b4dd245f 100644
--- a/libs/libuwsc/Makefile
+++ b/libs/libuwsc/Makefile
@@ -14,7 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL=https://github.com/zhaojh329/libuwsc/releases/download/v$(PKG_VERSION)
 PKG_HASH:=bae2cd13eda86876ebcf99a38a069f5e8c01717713d2fec25031051b9c47624b
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Jianhui Zhao <jianhuizhao329@gmail.com>
 PKG_LICENSE:=MIT
diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile
index 50fc1d5e8d..7a180e3a33 100644
--- a/libs/libwebsockets/Makefile
+++ b/libs/libwebsockets/Makefile
@@ -18,8 +18,6 @@ PKG_HASH:=db948be74c78fc13f1f1a55e76707d7baae3a1c8f62b625f639e8f2736298324
 
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
-
 PKG_LICENSE:=LGPL-2.1+exception
 PKG_LICENSE_FILES:=LICENSE
 
diff --git a/libs/libyubikey/Makefile b/libs/libyubikey/Makefile
index b66def39af..486a54525a 100644
--- a/libs/libyubikey/Makefile
+++ b/libs/libyubikey/Makefile
@@ -11,8 +11,6 @@ PKG_MAINTAINER:=Stuart B. Wilkins <stuwilkins@mac.com>
 PKG_LICENSE_FILES:=COPYING
 PKG_LICENSE:=BSD-2-Clause
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/libyubikey-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libyubikey
diff --git a/libs/xmlrpc-c/Makefile b/libs/xmlrpc-c/Makefile
index 665c697208..a3719ef322 100644
--- a/libs/xmlrpc-c/Makefile
+++ b/libs/xmlrpc-c/Makefile
@@ -14,7 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(PKG_VERSION)
 PKG_HASH:=82f9a4f6dee03f6a58921d75a65949dd4f0036a4c268bce6a4343338932ec065
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=VARIOUS
diff --git a/libs/zmq/Makefile b/libs/zmq/Makefile
index a202d1a382..cfb6c70f37 100644
--- a/libs/zmq/Makefile
+++ b/libs/zmq/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/zeromq/zeromq4-1/releases/download/v$(PKG_VERSION)
 PKG_HASH:=31c383cfcd3be1dc8a66e448c403029e793687e70473b89c4cc0bd626e7da299
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
 PKG_LICENSE:=GPL-3.0-or-later
diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index ded0999f85..26049dfd33 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -26,8 +26,6 @@ PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
diff --git a/mail/emailrelay/Makefile b/mail/emailrelay/Makefile
index cef6e22c08..089abb323a 100644
--- a/mail/emailrelay/Makefile
+++ b/mail/emailrelay/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE_URL:=@SF/emailrelay/$(PKG_VERSION)
 PKG_HASH:=0b3a98edfdc8deaf2b3d14e2d2a7fa8402f6703d83ac7458653994124de6a587
 PKG_MAINTAINER:=Federico Di Marco <fededim@gmail.com>
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 PKG_CONFIG_DEPENDS:=CONFIG_EMAILRELAY_SUPPORT_VERBOSE_DBG CONFIG_EMAILRELAY_SSL
 
 PKG_LICENSE:=GPL-3.0
diff --git a/mail/mailsend/Makefile b/mail/mailsend/Makefile
index f591638148..019a44a648 100644
--- a/mail/mailsend/Makefile
+++ b/mail/mailsend/Makefile
@@ -20,8 +20,6 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYRIGHT
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mailsend/default
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 3595949a45..871dc32c32 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://marlam.de/msmtp/releases
 PKG_HASH:=1613daced9c47b8c028224fc076799c2a4d72923e242be4e9e5c984cbbbb9f39
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 5a18edf1a6..d23b7b6b33 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -217,8 +217,6 @@ FFMPEG_PATENTED_PARSERS:= \
 	hevc \
 	vc1 \
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
 PKG_CONFIG_DEPENDS:= \
 	$(patsubst %,CONFIG_FFMPEG_CUSTOM_ENCODER_%,$(FFMPEG_CUSTOM_ENCODERS)) \
 	$(patsubst %,CONFIG_FFMPEG_CUSTOM_DECODER_%,$(FFMPEG_CUSTOM_DECODERS)) \
diff --git a/net/daemonlogger/Makefile b/net/daemonlogger/Makefile
index 82eb4fc32d..ba81a7bc51 100644
--- a/net/daemonlogger/Makefile
+++ b/net/daemonlogger/Makefile
@@ -20,7 +20,6 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/foolsm/Makefile b/net/foolsm/Makefile
index 43c1d1d047..c5d8feed6e 100644
--- a/net/foolsm/Makefile
+++ b/net/foolsm/Makefile
@@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://lsm.foobar.fi/download
 PKG_HASH:=33210209ca38b3bfef1a9180f765266a134fc811dea8bc06450a3bd48d1d083e
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/foolsm
diff --git a/net/frr/Makefile b/net/frr/Makefile
index 1388e51ef5..c507eaad8c 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -13,7 +13,6 @@ PKG_RELEASE:=2
 PKG_SOURCE_URL:=https://github.com/FRRouting/frr/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_HASH:=2a4210565e7b41d366f7b9f5f745917d67a0b159f3b6bd49d75f9e730557db2f
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 6cd2ae16cf..f841ec263f 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.haproxy.org/download/2.0/src
 PKG_HASH:=3873cd72028ed1bd2506dd174e01a92620e92683092f34234c96e067dcb113dc
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>, \
 		Christian Lachner <gladiac@gmail.com>
diff --git a/net/httping/Makefile b/net/httping/Makefile
index 7de0b7285d..b4ed1daffa 100644
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -15,7 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://www.vanheusden.com/httping
 PKG_HASH:=3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/knot/Makefile b/net/knot/Makefile
index 93ab341e9d..8d023d385d 100644
--- a/net/knot/Makefile
+++ b/net/knot/Makefile
@@ -19,7 +19,6 @@ PKG_MAINTAINER:=Daniel Salzman <daniel.salzman@nic.cz>
 PKG_LICENSE:=GPL-3.0 LGPL-2.0 0BSD BSD-3-Clause OLDAP-2.8
 PKG_CPE_ID:=cpe:/a:knot-dns:knot_dns
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
diff --git a/net/mini_snmpd/Makefile b/net/mini_snmpd/Makefile
index a5470d53df..a40ba7e959 100644
--- a/net/mini_snmpd/Makefile
+++ b/net/mini_snmpd/Makefile
@@ -22,7 +22,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=175d4d9b69c3195ef850eaffd8ac63d012a052089b4a9d074b4d3aef96888b8f
 
 PKG_FIXUP:=autoreconf
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 # As warned by upstream maintainer and binutils 
diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index c7777f27bc..5a88b0e5f6 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -18,7 +18,6 @@ PKG_CPE_ID:=cpe:/a:eclipse:mosquitto
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://mosquitto.org/files/source/
 PKG_HASH:=bcd31a8fbbd053fee328986fadd8666d3058357ded56b9782f7d4f19931d178e
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index c14fb15795..354b375d21 100644
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -20,8 +20,6 @@ PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> \
 PKG_LICENSE:=2-clause BSD-like license
 PKG_CPE_ID:=cpe:/a:nginx:nginx
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
 PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
diff --git a/net/ngircd/Makefile b/net/ngircd/Makefile
index 94fd4910f6..970b0e67e9 100644
--- a/net/ngircd/Makefile
+++ b/net/ngircd/Makefile
@@ -14,7 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://ngircd.barton.de/pub/ngircd
 PKG_HASH:=c4997cae3e3dd6ff6a605ca274268f2b8c9ba0b1a96792c7402e5594222eee4e
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-2.0
diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index e8efdbeb88..62a3280c77 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -26,8 +26,6 @@ PKG_CPE_ID:=cpe:/a:nmap:nmap
 
 PKG_INSTALL:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 NMAP_DEPENDS:=+libpcap +libstdcpp +zlib +libpcre
diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index b6fb9f6448..27bff1d1d9 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -14,7 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.nlnetlabs.nl/downloads/nsd
 PKG_HASH:=d17c0ea3968cb0eb2be79f2f83eb299b7bfcc554b784007616eed6ece828871f
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Vasilis Tsiligiannis <acinonyx@openwrt.gr>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/net/nut/Makefile b/net/nut/Makefile
index 614a3dae9d..38605cc46b 100644
--- a/net/nut/Makefile
+++ b/net/nut/Makefile
@@ -19,7 +19,6 @@ PKG_LICENSE:=GPL-2.0-or-later GPL-3.0-or-later GPL-1.0-or-later Artistic-1.0-Per
 PKG_LICENSE_FILES:=LICENSE-GPL2 LICENSE-GPL3 COPYING
 PKG_FIXUP:=autoreconf
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL:=1
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 094b13d387..97b7fc3044 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -21,7 +21,6 @@ PKG_LICENSE:=BSD ISC
 PKG_LICENSE_FILES:=LICENCE
 PKG_CPE_ID:=cpe:/a:openssh:openssh
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_REMOVE_FILES:=
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/net/opentracker/Makefile b/net/opentracker/Makefile
index 2805af2f72..435abddcfd 100644
--- a/net/opentracker/Makefile
+++ b/net/opentracker/Makefile
@@ -18,7 +18,6 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=git
 PKG_BUILD_DEPENDS:=libowfat
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/sshfs/Makefile b/net/sshfs/Makefile
index d243bf2c17..4db0a2f3d8 100644
--- a/net/sshfs/Makefile
+++ b/net/sshfs/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/libfuse/sshfs/releases/download/$(PKG_NAME)-$(PKG_VERSION)
 PKG_HASH:=70845dde2d70606aa207db5edfe878e266f9c193f1956dd10ba1b7e9a3c8d101
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
diff --git a/net/uanytun/Makefile b/net/uanytun/Makefile
index cb85c38eb4..1bc995ddcb 100644
--- a/net/uanytun/Makefile
+++ b/net/uanytun/Makefile
@@ -18,7 +18,6 @@ PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.anytun.org/download/
 PKG_HASH:=076318c771c908386c4408dda0769171542da701785302903641ce23fd33a295
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_MAINTAINER:=Christian Pointner <equinox@spreadspace.org>
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=LICENSE
diff --git a/net/unbound/Makefile b/net/unbound/Makefile
index dbc6c75846..ef7a5e49ee 100644
--- a/net/unbound/Makefile
+++ b/net/unbound/Makefile
@@ -23,7 +23,6 @@ PKG_CPE_ID:=cpe:/a:nlnetlabs:unbound
 PKG_BUILD_PARALLEL:=1
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 696ad3602f..362bcdf6d3 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -14,7 +14,6 @@ PKG_RELEASE:=3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://security.appspot.com/downloads/
 PKG_HASH:=9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl>
 PKG_LICENSE:=GPLv2
diff --git a/net/wget/Makefile b/net/wget/Makefile
index 83c91374ed..306da1b14d 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -20,8 +20,6 @@ PKG_LICENSE_FILES:=COPYING
 
 PKG_CPE_ID:=cpe:/a:gnu:wget
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/wget/Default
diff --git a/net/wifidog/Makefile b/net/wifidog/Makefile
index a9593a830f..03e78a38fc 100644
--- a/net/wifidog/Makefile
+++ b/net/wifidog/Makefile
@@ -15,7 +15,6 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/wifidog/wifidog-gateway
 PKG_SOURCE_VERSION:=$(PKG_VERSION)
 PKG_MIRROR_HASH:=9ffd9f3ae54baceb723abb7a04e27a9b6a3ff1479f8a3bfda9b8a496e8b4050f
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Michael Haas <haas@computerlinguist.org>
 PKG_LICENSE:=GPL-2.0-or-later
diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index 609f3a375a..1a7d8f77bf 100644
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -17,7 +17,6 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 
 PKG_CONFIG_DEPENDS:= \
diff --git a/sound/shairport-sync/Makefile b/sound/shairport-sync/Makefile
index 1621a11fe4..44299b1724 100644
--- a/sound/shairport-sync/Makefile
+++ b/sound/shairport-sync/Makefile
@@ -13,7 +13,6 @@ PKG_RELEASE:=3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/mikebrady/shairport-sync/tar.gz/$(PKG_VERSION)?
 PKG_HASH:=4f1ee142b887842727ae0c310e21c83ea2386518e841a25c7ddb015d08b54eba
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
 		Mike Brady <mikebrady@eircom.net>
diff --git a/sound/squeezelite/Makefile b/sound/squeezelite/Makefile
index 13834ba516..23e4e79566 100644
--- a/sound/squeezelite/Makefile
+++ b/sound/squeezelite/Makefile
@@ -20,8 +20,6 @@ PKG_SOURCE_VERSION:=451cad8da651073d18118fb9ca39faef550825ff
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=e6082b486e364c8cbd7db96fc06dc5243242a3ac786113e42e3061c06ea8889e
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/squeezelite/default
diff --git a/utils/acpica-unix/Makefile b/utils/acpica-unix/Makefile
index 9e748c8ac4..85b9e2576e 100644
--- a/utils/acpica-unix/Makefile
+++ b/utils/acpica-unix/Makefile
@@ -18,7 +18,6 @@ PKG_MAINTAINER:=Philip Prindeville <philipp@redfish-solutions.com>
 
 PKG_LICENSE:=GPL-2.0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_FORTIFY_SOURCE:=0
 PKG_BUILD_PARALLEL:=1
 
diff --git a/utils/bandwidthd/Makefile b/utils/bandwidthd/Makefile
index 9dd1f64d35..7f72018ebb 100644
--- a/utils/bandwidthd/Makefile
+++ b/utils/bandwidthd/Makefile
@@ -19,8 +19,6 @@ PKG_MAINTAINER:=Jean-Michel Lacroix <lacroix@lepine-lacroix.info>
 
 PKG_LICENSE:=GPL-2.0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
 PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/utils/cryptsetup/Makefile b/utils/cryptsetup/Makefile
index 875084c036..ffa8e354df 100644
--- a/utils/cryptsetup/Makefile
+++ b/utils/cryptsetup/Makefile
@@ -14,7 +14,6 @@ PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/cryptsetup/v2.1
 PKG_HASH:=a3eeb2741f8f3376d16585191f3c60e067dd987e096c3c4b073fab7748b1c897
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later
diff --git a/utils/fish/Makefile b/utils/fish/Makefile
index 69b2922755..b0cb3d2240 100644
--- a/utils/fish/Makefile
+++ b/utils/fish/Makefile
@@ -17,7 +17,6 @@ PKG_CPE_ID:=cpe:/a:fishshell:fish
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/utils/flashrom/Makefile b/utils/flashrom/Makefile
index 5cea259a19..937b48035e 100644
--- a/utils/flashrom/Makefile
+++ b/utils/flashrom/Makefile
@@ -15,7 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://download.flashrom.org/releases
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_HASH:=3702fa215ba5fb5af8e54c852d239899cfa1389194c1e51cb2a170c4dc9dee64
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
 
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later
diff --git a/utils/less/Makefile b/utils/less/Makefile
index f74a40122f..26a08ab688 100644
--- a/utils/less/Makefile
+++ b/utils/less/Makefile
@@ -20,7 +20,6 @@ PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Julen Landa Alustiza <julen@zokormazo.info>
 PKG_CPE_ID:=cpe:/a:gnu:less
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
diff --git a/utils/openzwave/Makefile b/utils/openzwave/Makefile
index da63dfb725..77afe41553 100644
--- a/utils/openzwave/Makefile
+++ b/utils/openzwave/Makefile
@@ -16,7 +16,6 @@ PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://old.openzwave.com/downloads
 PKG_HASH:=4ecf39787aaf278c203764069b581dbc26094ce57cafeab4a0c1f012d2c0ac69
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/utils/ykclient/Makefile b/utils/ykclient/Makefile
index 673364c785..e6541437c1 100644
--- a/utils/ykclient/Makefile
+++ b/utils/ykclient/Makefile
@@ -12,8 +12,6 @@ PKG_LICENSE_FILES:=COPYING
 PKG_LICENSE:=BSD-2-Clause
 PKG_BUILD_DEPENDS:=curl
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/ykclient-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ykclient