From 0e6b38e4c8a218761515151aad45ff4e49fcb741 Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Wed, 11 Jul 2018 18:17:17 +0200
Subject: [PATCH] [wip/talos-metapkg-ros-control] Use ros-control-toolbox when
not on PAL-distro.
---
talos-metapkg-ros-control-sot/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/talos-metapkg-ros-control-sot/Makefile b/talos-metapkg-ros-control-sot/Makefile
index c749669d..c460a535 100644
--- a/talos-metapkg-ros-control-sot/Makefile
+++ b/talos-metapkg-ros-control-sot/Makefile
@@ -34,7 +34,6 @@ include ../../lang/ros-message-runtime/depend.mk
include ../../math/ros-geometry/depend.mk
include ../../middleware/ros-actionlib/depend.mk
include ../../middleware/ros-comm/depend.mk
-include ../../motion/ros-control-toolbox/depend.mk
include ../../wip/dynamic-graph-bridge-v3/depend.mk
include ../../wip/sysdep/pal-distro.mk
@@ -43,6 +42,7 @@ ifeq (palerbium,${PALDISTRO})
else
include ../../wip/pal-hardware-interfaces/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
+ include ../../motion/ros-control-toolbox/depend.mk
endif
include ../../wip/roscontrol-sot/depend.mk
--
GitLab