From 706d827ab4a71f41b74d17e57723204e14f5c938 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 13 Aug 2018 17:32:56 +0200
Subject: [PATCH] [wip/jrl-walkgen-v3] add conflict with older version
while here, build the package in the standard directory
---
jrl-walkgen-v3/Makefile | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/jrl-walkgen-v3/Makefile b/jrl-walkgen-v3/Makefile
index 81151be8..861fd31b 100644
--- a/jrl-walkgen-v3/Makefile
+++ b/jrl-walkgen-v3/Makefile
@@ -17,18 +17,14 @@ LICENSE= gnu-lgpl-v3
DYNAMIC_PLIST_DIRS+= share/doc/jrl-walkgen
+CONFLICTS+= jrl-walkgen
+
PKG_SUPPORTED_OPTIONS+= debug
PKG_OPTION_DESCR.debug= Compile in debugging mode
PKG_OPTION_SET.debug:= CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
-# Build the package in a separate directory
-CONFIGURE_DIRS= _build
-CMAKE_ARG_PATH= ..
CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
-pre-configure:
- ${RUN}${MKDIR} ${WRKSRC}/_build
-
include ../../mk/sysdep/cmake.mk
include ../../math/pinocchio/depend.mk
include ../../wip/eigen-quadprog/depend.mk
--
GitLab