From: Alexandru Ardelean <ardeleanalex@gmail.com>
Date: Wed, 10 Jan 2018 07:43:00 +0000 (+0200)
Subject: python,python3: simplify path to install shell-script
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=57987b699b4a02552f2ff916e797a2e930c63d25;p=feed%2Fpackages.git

python,python3: simplify path to install shell-script

Now that all files are exported, it makes sense
to just reference the script directly.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
---

diff --git a/lang/python/python-package.mk b/lang/python/python-package.mk
index 2bcae919e5..d1486d7261 100644
--- a/lang/python/python-package.mk
+++ b/lang/python/python-package.mk
@@ -70,20 +70,10 @@ define PyPackage
   define Package/$(1)/install
 	$(call PyPackage/$(1)/install,$$(1))
 	find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
-	if [ -e files/python-package-install.sh ] ; then \
-		$(SHELL) files/python-package-install.sh \
-			"$(PKG_INSTALL_DIR)" "$$(1)" \
-			"$(HOST_PYTHON_BIN)" "$$(2)" \
-			"$$$$$$$$$$(call shvar,PyPackage/$(1)/filespec)" ; \
-	elif [ -e $(STAGING_DIR)/mk/python-package-install.sh ] ; then \
-		$(SHELL) $(STAGING_DIR)/mk/python-package-install.sh \
-			"$(PKG_INSTALL_DIR)" "$$(1)" \
-			"$(HOST_PYTHON_BIN)" "$$(2)" \
-			"$$$$$$$$$$(call shvar,PyPackage/$(1)/filespec)" ; \
-	else \
-		echo "No 'python-package-install.sh' script found" ; \
-		exit 1 ; \
-	fi
+	$(SHELL) $(python_mk_path)python-package-install.sh \
+		"$(PKG_INSTALL_DIR)" "$$(1)" \
+		"$(HOST_PYTHON_BIN)" "$$(2)" \
+		"$$$$$$$$$$(call shvar,PyPackage/$(1)/filespec)"
   endef
 
   define Package/$(1)-src/install
diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk
index 25d98342aa..b7aaa645c3 100644
--- a/lang/python/python3-package.mk
+++ b/lang/python/python3-package.mk
@@ -69,20 +69,10 @@ define Py3Package
   define Package/$(1)/install
 	$(call Py3Package/$(1)/install,$$(1))
 	find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
-	if [ -e files/python3-package-install.sh ] ; then \
-		$(SHELL) files/python3-package-install.sh \
-			"$(PKG_INSTALL_DIR)" "$$(1)" \
-			"$(HOST_PYTHON3_BIN)" "$$(2)" \
-			"$$$$$$$$$$(call shvar,Py3Package/$(1)/filespec)" ; \
-	elif [ -e $(STAGING_DIR)/mk/python3-package-install.sh ] ; then \
-		$(SHELL) $(STAGING_DIR)/mk/python3-package-install.sh \
-			"$(PKG_INSTALL_DIR)" "$$(1)" \
-			"$(HOST_PYTHON3_BIN)" "$$(2)" \
-			"$$$$$$$$$$(call shvar,Py3Package/$(1)/filespec)" ; \
-	else \
-		echo "No 'python3-package-install.sh' script found" ; \
-		exit 1 ; \
-	fi
+	$(SHELL) $(python3_mk_path)python3-package-install.sh \
+		"$(PKG_INSTALL_DIR)" "$$(1)" \
+		"$(HOST_PYTHON3_BIN)" "$$(2)" \
+		"$$$$$$$$$$(call shvar,Py3Package/$(1)/filespec)"
   endef
 
   define Package/$(1)-src/install