From: Alexandru Ardelean <redacted>
Date: Thu, 2 Mar 2017 16:04:43 +0000 (+0200)
Subject: python,python3: move PyPackage install rules in the beggining of the Package install... 
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=df0d0bcc0016866fce67dd04d01e1fc350ddf152;p=openwrt-packages.git

python,python3: move PyPackage install rules in the beggining of the Package install rules

So that we can process Python sources installed
by those rules, if we need to.

Signed-off-by: Alexandru Ardelean <redacted>
---

diff --git a/lang/python/Makefile b/lang/python/Makefile
index b6846f52d..4300eef71 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -259,6 +259,7 @@ $(subst $(space),$(newline),$(foreach lib_file,$(PYTHON_LIB_FILES_DEL),-|$(lib_f
 endef
 
 define PyPackage/python-base/install
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib
 	$(LN) python$(PYTHON_VERSION) $(1)/usr/bin/python
 	$(LN) python$(PYTHON_VERSION) $(1)/usr/bin/python2
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* $(1)/usr/lib/
diff --git a/lang/python/files/python-package.mk b/lang/python/files/python-package.mk
index 732dbf05d..dfc07a612 100644
--- a/lang/python/files/python-package.mk
+++ b/lang/python/files/python-package.mk
@@ -53,6 +53,7 @@ define PyPackage
   $(call shexport,PyPackage/$(1)/filespec)
 
   define Package/$(1)/install
+	$(call PyPackage/$(1)/install,$$(1))
 	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" -o -name "*\.exe" | xargs rm -f
 	if [ -e files/python-package-install.sh ] ; then \
 		$(SHELL) files/python-package-install.sh \
@@ -66,7 +67,6 @@ define PyPackage
 		echo "No 'python-package-install.sh' script found" ; \
 		exit 1 ; \
 	fi
-	$(call PyPackage/$(1)/install,$$(1))
   endef
 endef
 
diff --git a/lang/python3/files/python3-package.mk b/lang/python3/files/python3-package.mk
index 7881c1f04..f1f3ff546 100644
--- a/lang/python3/files/python3-package.mk
+++ b/lang/python3/files/python3-package.mk
@@ -53,6 +53,7 @@ define Py3Package
   $(call shexport,Py3Package/$(1)/filespec)
 
   define Package/$(1)/install
+	$(call Py3Package/$(1)/install,$$(1))
 	find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" -o -name "*\.exe" | xargs rm -f
 	if [ -e files/python3-package-install.sh ] ; then \
 		$(SHELL) files/python3-package-install.sh \
@@ -66,7 +67,6 @@ define Py3Package
 		echo "No 'python3-package-install.sh' script found" ; \
 		exit 1 ; \
 	fi
-	$(call Py3Package/$(1)/install,$$(1))
   endef
 endef