treewide: use relative include paths for python Makefiles

This updates the include paths for python(3)-package.mk to be relative
to the package Makefile. If not, in certain cases this will print errors
like the following one:

ERROR: please fix feeds/openwrt/net/freeradius3/Makefile
   - see logs/feeds/openwrt/net/freeradius3/dump.txt for details

In the dump.txt there is the following:

Makefile:42: /mylocalpath/feeds/packages/lang/python/python3-package.mk: No such file or directory
make[1]: *** No rule to make target '/mylocalpath/feeds/packages/lang/python/python3-package.mk'.  Stop.

The relative path is used already in 19.07 for most of the packages, and
has been updated for the packages at hand in master as well:

302f4d17e336 ("libmraa,libupm: Disable default Python package build recipe")
1bc2f4f3c621 ("treewide: Remove Python variants for non-Python packages")

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/libs/libmraa/Makefile b/libs/libmraa/Makefile
index af365fdfa8af13bef79185dc9e7201319af1bab0..c710d9633bb5081f90fd03c3ed10c7941be83c4e 100644 (file)
--- a/libs/libmraa/Makefile
+++ b/libs/libmraa/Makefile
@@ -26,8 +26,8 @@ PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
-include $(TOPDIR)/feeds/packages/lang/python/python-package.mk
-include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
+include ../../lang/python/python-package.mk
+include ../../lang/python/python3-package.mk
 
 CMAKE_OPTIONS=-DENABLEEXAMPLES=0 \
        -DFIRMATA=ON

diff --git a/libs/libupm/Makefile b/libs/libupm/Makefile
index 384ab1816cc8c271d6d4ad38006c0db66c4799f8..4900f6af4bbdf408b322d705b2594f04e6acfa22 100644 (file)
--- a/libs/libupm/Makefile
+++ b/libs/libupm/Makefile
@@ -25,8 +25,8 @@ PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
-include $(TOPDIR)/feeds/packages/lang/python/python-package.mk
-include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
+include ../../lang/python/python-package.mk
+include ../../lang/python/python3-package.mk
 
 UPM_MODULES:= \
        a110x abp ad8232 adafruitms1438 adafruitss adc121c021 adis16448 ads1x15 adxl335 adxl345 \

diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index e63b7c9b6fff91a7b8fae1a1cc06711a5d05538f..5f76ee0a2b83bc2a6edd329993d62c2ab4c280b9 100644 (file)
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -30,8 +30,8 @@ PKG_CONFIG_DEPENDS := \
 CFLAGS += $(FPIC)
 
 include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/packages/lang/python/python-package.mk
-include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
+include ../../lang/python/python-package.mk
+include ../../lang/python/python3-package.mk
 
 define Package/freeradius3/config
   source "$(SOURCE)/Config.in"

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 8c8961cc45e52fbd1e5fde10177465430cb10166..d1f6bdb476f475f689b7b2313ff08ac0d6520487 100644 (file)
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -37,9 +37,9 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
-include $(TOPDIR)/feeds/packages/lang/python/python3-host.mk
-#include $(TOPDIR)/feeds/packages/lang/python/python-package.mk
-include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
+include ../../lang/python/python3-host.mk
+#include ../../lang/python/python-package.mk
+include ../../lang/python/python3-package.mk
 
 define Package/samba4/Default
   SECTION:=net