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

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 b6846f52dbe6d7d20f247f9c45ca212722926fcb..4300eef713870c7a88c52dd5c1a66c0e9b4b28db 100644 (file)
--- 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 732dbf05d1c733095dcc90e2ca7e0325120993d4..dfc07a612dc815f5997750f1505ae0a006d47174 100644 (file)
--- 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 7881c1f046d31f2fbcac9a105c065666d3075162..f1f3ff54624cfdbf21b617d58098e0e711359785 100644 (file)
--- 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