From eda8e9a6f5d1820aa3a7bb7c09bb868ad82ad879 Mon Sep 17 00:00:00 2001
From: Olivier Stasse <olivier.stasse@gmail.com>
Date: Wed, 3 Feb 2016 17:00:55 +0100
Subject: [PATCH] [wip/sot-hrprtc-hrp2] Depends on openrtm-aist.
---
sot-hrprtc-hrp2/INSTALL | 14 +++++++-------
sot-hrprtc-hrp2/Makefile | 1 +
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/sot-hrprtc-hrp2/INSTALL b/sot-hrprtc-hrp2/INSTALL
index f231be73..c5deb9ee 100644
--- a/sot-hrprtc-hrp2/INSTALL
+++ b/sot-hrprtc-hrp2/INSTALL
@@ -7,25 +7,25 @@ case $2 in
POST-INSTALL)
if ${TEST} -f ${PKG_PREFIX}/lib/RtcStackOfTasks.so; then
- ln -s ${PKG_PREFIX}/lib/RtcStackOfTasks.so /opt/grx/lib/RtcStackOfTasks.so
+ ln -sf ${PKG_PREFIX}/lib/RtcStackOfTasks.so /opt/grx/lib/RtcStackOfTasks.so
fi
if ${TEST} -f ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/bin/rtc-stack-of-tasks-comp; then
- ln -s ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/bin/rtc-stack-of-tasks-comp /opt/grx/HRP2LAAS/bin/rtc-stack-of-tasks-comp
+ ln -sf ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/bin/rtc-stack-of-tasks-comp /opt/grx/HRP2LAAS/bin/rtc-stack-of-tasks-comp
fi
if ${TEST} -f ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/bin/RtcStackOfTasksComp/rtc.conf; then
- ln -s ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/bin/RtcStackOfTasksComp/rtc.conf /opt/grx/HRP2LAAS/bin/RtcStackOfTasksComp/rtc.conf
+ ln -sf ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/bin/RtcStackOfTasksComp/rtc.conf /opt/grx/HRP2LAAS/bin/RtcStackOfTasksComp/rtc.conf
fi
if ${TEST} -f ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/script/guisot.py; then
- ln -s ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/script/guisot.py /opt/grx/HRP2LAAS/script/guisot.py
+ ln -sf ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/script/guisot.py /opt/grx/HRP2LAAS/script/guisot.py
fi
if ${TEST} -f ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/script/guiinfosot.py; then
- ln -s ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/script/guiinfosot.py /opt/grx/HRP2LAAS/script/guiinfosot.py
+ ln -sf ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/script/guiinfosot.py /opt/grx/HRP2LAAS/script/guiinfosot.py
fi
if ${TEST} -f ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/script/sot.py; then
- ln -s ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/script/sot.py /opt/grx/HRP2LAAS/script/sot.py
+ ln -sf ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/script/sot.py /opt/grx/HRP2LAAS/script/sot.py
fi
if ${TEST} -f ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/script/sotinfo.py; then
- ln -s ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/script/sotinfo.py /opt/grx/HRP2LAAS/script/sotinfo.py
+ ln -sf ${PKG_PREFIX}/share/${LOCALPKGNAME}/HRP2LAAS/script/sotinfo.py /opt/grx/HRP2LAAS/script/sotinfo.py
fi
;;
diff --git a/sot-hrprtc-hrp2/Makefile b/sot-hrprtc-hrp2/Makefile
index 46e4d701..862e36c0 100644
--- a/sot-hrprtc-hrp2/Makefile
+++ b/sot-hrprtc-hrp2/Makefile
@@ -18,6 +18,7 @@ DYNAMIC_PLIST_DIRS+= share/doc/sot-hrprtc-hrp2
CMAKE_ARGS+= -DROBOTPKG=ON
+include ../../wip/mk/sysdep/openrtm-aist.mk
include ../../wip/sot-hrp2/depend.mk
include ../../robots/hrp2-14/depend.mk
include ../../wip/hrp2-bringup/depend.mk
--
GitLab