From ce2fc0303bba53d5ca03200c1196fca0ac5e677f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9verin=20Lemaignan?= <severin.lemaignan@laas.fr> Date: Tue, 9 Aug 2011 17:06:48 +0200 Subject: [PATCH] [wip/morse-pocolibs] Fixed depend.mk + dependency on swig --- morse-pocolibs/Makefile | 2 +- morse-pocolibs/depend.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/morse-pocolibs/Makefile b/morse-pocolibs/Makefile index 9111da9a..4226be7c 100644 --- a/morse-pocolibs/Makefile +++ b/morse-pocolibs/Makefile @@ -52,5 +52,5 @@ define PKG_OPTION_SET.hri endef include ../../simulation/morse/depend.mk -include ../../mk/sysdep/swig.mk +include ../../devel/swig/depend.mk include ../../mk/robotpkg.mk diff --git a/morse-pocolibs/depend.mk b/morse-pocolibs/depend.mk index 72e59aca..58897563 100644 --- a/morse-pocolibs/depend.mk +++ b/morse-pocolibs/depend.mk @@ -19,10 +19,9 @@ DEPEND_ABI.morse-pocolibs?= morse-pocolibs>=0.2 DEPEND_DIR.morse-pocolibs?= ../../wip/morse-pocolibs SYSTEM_SEARCH.morse-pocolibs=\ - ${PYTHON_SITELIB}/morse/middleware/pocolibs_mw.py + lib/python*/{site,dist}-packages/morse/middleware/pocolibs_mw.py -DEPEND_METHOD.python3+= bootstrap -include ../../lang/python3/depend.mk +include ../../mk/sysdep/python.mk endif # MORSE_POCOLIBS_DEPEND_MK ------------------------------------------- -- GitLab