[wip/{ → py-}hpp-environments] add PYTHON_NOTAG_CONFLICT

Makefile

@@ -27,7 +27,6 @@ SUBDIR+=	hey5-description
 SUBDIR+=	histodet
 SUBDIR+=	hpp-affordance
 SUBDIR+=	hpp-benchmark
-SUBDIR+=	hpp-environments
 SUBDIR+=	hpp-hrp2
 SUBDIR+=	hpp-rbprm
 SUBDIR+=	hpp-rbprm-robot-data
@@ -93,6 +92,7 @@ SUBDIR+=	py-hpp-affordance-corba
 SUBDIR+=	py-hpp-baxter
 SUBDIR+=	py-hpp-bezier-com-traj
 SUBDIR+=	py-hpp-centroidal-dynamics
+SUBDIR+=	py-hpp-environments
 SUBDIR+=	py-hpp-rbprm-corba
 SUBDIR+=	py-mavlink
 SUBDIR+=	py-morse

hpp-rbprm/Makefile

@@ -12,7 +12,7 @@ USE_PYTHON=	true
 include ../../meta-pkgs/hpp/Makefile.common
 
 include ../../wip/hpp-rbprm-robot-data/depend.mk
-include ../../wip/hpp-environments/depend.mk
+include ../../wip/py-hpp-environments/depend.mk
 
 include ../../path/hpp-core/depend.mk
 include ../../path/hpp-util/depend.mk

hpp-environments/Makefile → py-hpp-environments/Makefile

-# robotpkg Makefile for:	wip/hpp-environments
+# robotpkg Makefile for:	wip/py-hpp-environments
 # Created:			Guilhem Saurel on Fri, 10 Oct 2018
 #
 
-HPP_PACKAGE=	hpp-environments
-HPP_COMMENT=	Environments and robot descriptions for HPP
+HPP_PACKAGE=		hpp-environments
+HPP_COMMENT=		Environments and robot descriptions for HPP
 
-CATEGORIES=	wip
+CATEGORIES=		wip
 
-USE_PYTHON=	true
+USE_PYTHON=		true
+PYTHON_NOTAG_CONFLICT=	yes
 
 include ../../meta-pkgs/hpp/Makefile.common
 

hpp-environments/depend.mk → py-hpp-environments/depend.mk

-# robotpkg depend.mk for:	wip/hpp-environments
+# robotpkg depend.mk for:	wip/py-hpp-environments
 # Created:			Guilhem Saurel on Fri, 19 Oct 2018
 #
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH}+
-HPPENVIRONMENTS_DEPEND_MK:=	${HPPENVIRONMENTS_DEPEND_MK}+
+PY_HPP_ENVIRONMENTS_DEPEND_MK:=	${PY_HPP_ENVIRONMENTS_DEPEND_MK}+
 
 ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		hpp-environments
+DEPEND_PKG+=		py-hpp-environments
 endif
 
-ifeq (+,$(HPPENVIRONMENTS_DEPEND_MK)) # --------------------------------------
+ifeq (+,$(PY_HPP_ENVIRONMENTS_DEPEND_MK)) # --------------------------------------
 
 include ../../mk/sysdep/python.mk
 
-PREFER.hpp-environments?=	robotpkg
+PREFER.py-hpp-environments?=	robotpkg
 
-DEPEND_USE+=		hpp-environments
+DEPEND_USE+=		py-hpp-environments
 
-DEPEND_ABI.hpp-environments?=	${PKGTAG.python-}hpp-environments>=4.7.0
-DEPEND_DIR.hpp-environments?=	../../wip/hpp-environments
+DEPEND_ABI.py-hpp-environments?=	${PKGTAG.python-}hpp-environments>=4.7.0
+DEPEND_DIR.py-hpp-environments?=	../../wip/py-hpp-environments
 
-SYSTEM_SEARCH.hpp-environments=\
+SYSTEM_SEARCH.py-hpp-environments=\
 	include/hpp/environments/config.hh	\
 	'lib/pkgconfig/hpp-environments.pc:/Version/s/[^0-9.]//gp'
 
-endif # HPPENVIRONMENTS_DEPEND_MK --------------------------------------------
+endif # PY_HPP_ENVIRONMENTS_DEPEND_MK --------------------------------------------
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}