From e88e35249f06a8fe7c543572fb424b752fec22d0 Mon Sep 17 00:00:00 2001
From: Alexandru Ardelean <ardeleanalex@gmail.com>
Date: Thu, 29 Jun 2017 14:03:51 +0300
Subject: [PATCH] python,python3: install mk files in the Host/Install phase

The Build/InstallDev rule is activated only for target builds.
But if someone needs only the host Python, then
these files need to be installed in this phase, and not Build/InstallDev

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
---
 lang/python/python/Makefile  | 13 +++++++++++--
 lang/python/python3/Makefile | 20 ++++++++++++--------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/lang/python/python/Makefile b/lang/python/python/Makefile
index 1e84060878..1d37a51d80 100644
--- a/lang/python/python/Makefile
+++ b/lang/python/python/Makefile
@@ -188,7 +188,6 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/mk/
 	$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/ $(1)/usr/lib/pkgconfig
 	$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
 	$(INSTALL_DATA) \
@@ -292,8 +291,18 @@ HOST_CONFIGURE_ARGS+= \
 
 define Host/Install
 	$(MAKE) -C $(HOST_BUILD_DIR) install
-	$(INSTALL_DIR) $(HOST_PYTHON_DIR)/bin/
+	$(INSTALL_DIR) $(HOST_PYTHON_DIR)/bin/ $(STAGING_DIR)/mk/
 	$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON_DIR)/bin/pgen2
+	# Install these mk files in the Host/Install phase ;
+	# The Build/InstallDev rule is activated only for target builds.
+	# But if someone needs only the host Python, then
+	# these files need to be installed in this phase, and not Build/InstallDev
+	$(INSTALL_DATA) \
+		./files/python-package.mk \
+		./files/python-host.mk \
+		./files/python-version.mk \
+		./files/python-package-install.sh \
+		$(STAGING_DIR)/mk/
 endef
 
 $(eval $(call HostBuild))
diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile
index 5438a3ca7f..9e10d18063 100644
--- a/lang/python/python3/Makefile
+++ b/lang/python/python3/Makefile
@@ -182,15 +182,8 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/mk/
 	$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
-	$(INSTALL_DATA) \
-		./files/python3-package.mk \
-		./files/python3-host.mk \
-		./files/python3-version.mk \
-		./files/python3-package-install.sh \
-		$(STAGING_DIR)/mk/
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
 		$(1)/usr/include/
@@ -279,9 +272,20 @@ endef
 define Host/Install
 	$(MAKE) -C $(HOST_BUILD_DIR) install
 
-	$(INSTALL_DIR) $(HOST_PYTHON3_DIR)/bin/
+	$(INSTALL_DIR) $(HOST_PYTHON3_DIR)/bin/ $(STAGING_DIR)/mk/
 	$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON3_DIR)/bin/pgen3
 	$(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(HOST_PYTHON3_DIR)/bin/_freeze_importlib
+
+	# Install these mk files in the Host/Install phase ;
+	# The Build/InstallDev rule is activated only for target builds.
+	# But if someone needs only the host Python, then
+	# these files need to be installed in this phase, and not Build/InstallDev
+	$(INSTALL_DATA) \
+		./files/python3-package.mk \
+		./files/python3-host.mk \
+		./files/python3-version.mk \
+		./files/python3-package-install.sh \
+		$(STAGING_DIR)/mk/
 endef
 
 $(eval $(call HostBuild))
-- 
2.30.2