From b4bed361d7153f2568d9c46b6bb6ad61a44b1630 Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Mon, 25 Jan 2016 11:36:23 +0100
Subject: [PATCH] [wip/hrp2-machine] Fix naming conventions
---
hrp2-machine/Makefile | 8 ++++----
hrp2-machine/depend.mk | 4 ++--
hrp2-machine/distinfo | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/hrp2-machine/Makefile b/hrp2-machine/Makefile
index a20136c6..945b1260 100644
--- a/hrp2-machine/Makefile
+++ b/hrp2-machine/Makefile
@@ -2,11 +2,11 @@
# Created: Olivier Stasse on Wed, 17 Jun 2015
#
VERSION= 1.0.1
-ROS_PKG= hrp2_machine
+ROS_PKG= hrp2-machine
ROS_VERSION= ${ROS_PKG}-${VERSION}
-DISTNAME= hrp2_machine
-PKGNAME= hrp2_machine
-WRKSRC= ${WRKDIR}/${ROS_VERSION}
+DISTNAME= hrp2-machine
+PKGNAME= hrp2-machine
+WRKSRC= ${WRKDIR}/hrp2_machine-${VERSION}
CATEGORIES= robots
MASTER_SITES= ${MASTER_SITE_JRL}ros/${ROS_PKG}/
MASTER_REPOSITORY= ${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-machine
diff --git a/hrp2-machine/depend.mk b/hrp2-machine/depend.mk
index f025b0bf..4cfc96d0 100644
--- a/hrp2-machine/depend.mk
+++ b/hrp2-machine/depend.mk
@@ -9,12 +9,12 @@ ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= hrp2-machine
endif
-ifeq (+,$(ROMEO_DEPEND_MK)) # -------------------------------------------
+ifeq (+,$(HRP2_MACHINE_DEPEND_MK)) # -------------------------------------------
PREFER.hrp2-machine?= robotpkg
SYSTEM_SEARCH.hrp2-machine=\
- 'lib/pkgconfig/hrp2-machine.pc:/Version/s/[^0-9.]//gp'
+ 'lib/pkgconfig/hrp2_machine.pc:/Version/s/[^0-9.]//gp'
DEPEND_USE+= hrp2-machine
ROS_DEPEND_USER+= hrp2-machine
diff --git a/hrp2-machine/distinfo b/hrp2-machine/distinfo
index ed2aedac..c2e17820 100644
--- a/hrp2-machine/distinfo
+++ b/hrp2-machine/distinfo
@@ -1,3 +1,3 @@
-SHA1 (ros/hrp2_machine/hrp2_machine-1.0.1.tar.gz) = b23cfae99f7f5fa95fc3452f9a4a74b500bd85d7
-RMD160 (ros/hrp2_machine/hrp2_machine-1.0.1.tar.gz) = 05aa933781416f3e96960d810fcf2e580be1cc8a
-Size (ros/hrp2_machine/hrp2_machine-1.0.1.tar.gz) = 723268 bytes
+SHA1 (ros/hrp2-machine/hrp2-machine-1.0.1.tar.gz) = b23cfae99f7f5fa95fc3452f9a4a74b500bd85d7
+RMD160 (ros/hrp2-machine/hrp2-machine-1.0.1.tar.gz) = 05aa933781416f3e96960d810fcf2e580be1cc8a
+Size (ros/hrp2-machine/hrp2-machine-1.0.1.tar.gz) = 723268 bytes
--
GitLab