From 7b2714de826e763025094ad6344e76e82846c1e8 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Thu, 16 Jan 2020 14:59:03 +0100 Subject: [PATCH] [wip/talos-data] use {prf-,}gazebo-ros-pkgs Use: - wip/prf-gazebo-ros-pkgs-melodic on 18.04 - wip/prf-gazebo-ros-pkgs on 16.04 - simulation/gazebo-ros-pkgs otherwise --- talos-data/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/talos-data/Makefile b/talos-data/Makefile index c76a1676..6219b3bc 100644 --- a/talos-data/Makefile +++ b/talos-data/Makefile @@ -35,8 +35,10 @@ include ../../pkgtools/pkg-config/depend.mk include ../../wip/sysdep/ubuntu-distro.mk ifeq (bionic,${UBUNTUDISTRO}) include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk -else +else ifeq (xenial,${UBUNTUDISTRO}) include ../../wip/prf-gazebo-ros-pkgs/depend.mk +else + include ../../simulation/gazebo-ros-pkgs/depend.mk endif include ../../mk/sysdep/gazebo.mk -- GitLab