From 53e1692ae91b1b5fc59a7e8ab7fb98f8775eb4b6 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Sun, 13 Oct 2019 01:00:20 +0800 Subject: treewide: Use default PKG_BUILD_DIR when possible This removes lines that set PKG_BUILD_DIR when the set value is no different from the default value. Specifically, the line is removed if the assigned value is: * $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) The default PKG_BUILD_DIR was updated[1] to incorporate BUILD_VARIANT if it is set, so now this is identical to the default value. * $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR) if PKG_SOURCE_SUBDIR is set to $(PKG_NAME)-$(PKG_VERSION), making it the same as the previous case * $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) This is the same as the default PKG_BUILD_DIR when there is no BUILD_VARIANT. * $(BUILD_DIR)/[name]-$(PKG_VERSION) where [name] is a string that is identical to PKG_NAME [1]: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=e545fac8d968864a965edb9e50c6f90940b0a6c9 Signed-off-by: Jeffery To --- net/openssh/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'net/openssh/Makefile') diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 094b13d38..97b7fc304 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 -- cgit v1.2.3