From: Jeffery To Date: Mon, 18 Feb 2019 08:23:45 +0000 (+0800) Subject: python,python3: Fix calling default PyPackage/install X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=200a5a2eec896b2d34f1114d14df66d810c1f4bd;p=feed%2Fpackages.git python,python3: Fix calling default PyPackage/install This fixes Package/*/install to call PyPackage/*/install correctly. Previously, if a package used the default PyPackage/*/install, then it would not called. (A custom-defined PyPackage/*/install would be called with no issue.) Signed-off-by: Jeffery To --- diff --git a/lang/python/python-package.mk b/lang/python/python-package.mk index af35dcdb32..260c989686 100644 --- a/lang/python/python-package.mk +++ b/lang/python/python-package.mk @@ -68,7 +68,7 @@ define PyPackage $(call shexport,PyPackage/$(1)/filespec) define Package/$(1)/install - $(call PyPackage/$(1)/install,$$(1)) + $$(call PyPackage/$(1)/install,$$(1)) $(SHELL) $(python_mk_path)python-package-install.sh "2" \ "$(PKG_INSTALL_DIR)" "$$(1)" \ "$(HOST_PYTHON_BIN)" "$$(2)" \ diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk index 9cfa7673e7..8999665469 100644 --- a/lang/python/python3-package.mk +++ b/lang/python/python3-package.mk @@ -67,7 +67,7 @@ define Py3Package $(call shexport,Py3Package/$(1)/filespec) define Package/$(1)/install - $(call Py3Package/$(1)/install,$$(1)) + $$(call Py3Package/$(1)/install,$$(1)) $(SHELL) $(python3_mk_path)python-package-install.sh "3" \ "$(PKG_INSTALL_DIR)" "$$(1)" \ "$(HOST_PYTHON3_BIN)" "$$(2)" \