[Personalrobots-commit] SF.net SVN: personalrobots:[20606] pkg/trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 20606
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=20606&view=rev
Author:   tfoote
Date:     2009-08-04 01:40:10 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
Fixing 3rdparty Makefiles to be robust to calls with -C

Modified Paths:
--------------
    pkg/trunk/3rdparty/libsunflower/Makefile
    pkg/trunk/3rdparty/nepumuk/Makefile
    pkg/trunk/3rdparty/ocl/Makefile
    pkg/trunk/3rdparty/player/Makefile
    pkg/trunk/3rdparty/rtt/Makefile
    pkg/trunk/openrave_planning/openrave/Makefile
    pkg/trunk/openrave_planning/soqt/Makefile
    pkg/trunk/stacks/camera_drivers/libdc1394v2/Makefile
    pkg/trunk/stacks/common/bfl/Makefile
    pkg/trunk/stacks/laser_drivers/sicktoolbox/Makefile

Modified: pkg/trunk/3rdparty/libsunflower/Makefile
===================================================================

--- pkg/trunk/3rdparty/libsunflower/Makefile	2009-08-04 01:38:17 UTC (rev 20605)
+++ pkg/trunk/3rdparty/libsunflower/Makefile	2009-08-04 01:40:10 UTC (rev 20606)
@@ -23,13 +23,13 @@
 
 TARBALL=     build/libsunflower-$(TARBALL_VERSION).tar.gz
 TARBALL_URL= http://pr.willowgarage.com/downloads/libsunflower-$(TARBALL_VERSION).tar.gz
-SOURCE_DIR=  $(PWD)/build/libsunflower-$(TARBALL_VERSION)
+SOURCE_DIR=  build/libsunflower-$(TARBALL_VERSION)
 UNPACK_CMD=  tar xfz
-BUILD_DIR=   $(PWD)/build
-INST_DIR=    $(PWD)/local
+BUILD_DIR=   build
+INST_DIR=    local
 BOOST_DIR=   `rosboost-cfg --include_dirs`
 
-SVN_DIR=     $(PWD)/build/sunflower-svn
+SVN_DIR=     build/sunflower-svn
 SVN_URL=     https://libsunflower.svn.sourceforge.net/svnroot/libsunflower/trunk/sunflower
 
 #include $(shell rospack find mk)/download_unpack_build.mk
@@ -38,8 +38,8 @@
 installed: $(SVN_DIR) patched Makefile
 	cd $(SVN_DIR) && ./bootstrap-buildsystem.sh
 	test -d $(BUILD_DIR) || mkdir -p $(BUILD_DIR)
-	cd $(BUILD_DIR) && $(SVN_DIR)/configure --with-pic \
-	                                        --prefix=$(INST_DIR) \
+	cd $(BUILD_DIR) && `rospack find libsunflower`/$(SVN_DIR)/configure --with-pic \
+	                                        --prefix=`rospack find libsunflower`/$(INST_DIR) \
                                                 --with-boost=$(BOOST_DIR)
 	$(MAKE) -C $(BUILD_DIR) install
 	touch installed

Modified: pkg/trunk/3rdparty/nepumuk/Makefile
===================================================================
--- pkg/trunk/3rdparty/nepumuk/Makefile	2009-08-04 01:38:17 UTC (rev 20605)
+++ pkg/trunk/3rdparty/nepumuk/Makefile	2009-08-04 01:40:10 UTC (rev 20606)
@@ -1,9 +1,9 @@
 all: installed
 
 SVN_REVISION=    -r 1053
-BUILD_DIR=   $(PWD)/build
-INST_DIR=    $(PWD)/local
-SVN_DIR=     $(PWD)/build/nepumuk-svn
+BUILD_DIR=   build
+INST_DIR=    local
+SVN_DIR=     build/nepumuk-svn
 SVN_URL=     https://libsunflower.svn.sourceforge.net/svnroot/libsunflower/trunk/nepumuk
 
 ##later## ESTAR_DIR=   $(shell rospack find estar)/local
@@ -18,7 +18,7 @@
 installed: $(SVN_DIR) patched
 	cd $(SVN_DIR) && ./bootstrap-buildsystem.sh
 	test -d $(BUILD_DIR) || mkdir -p $(BUILD_DIR)
-	cd $(BUILD_DIR) && $(SVN_DIR)/configure --prefix=$(INST_DIR) \
+	cd $(BUILD_DIR) && `rospack find nepumuk`/$(SVN_DIR)/configure --prefix=`rospack find nepumuk`/$(INST_DIR) \
                                                 --with-sfl=$(SFL_DIR) \
                                                 --with-boost=$(BOOST_DIR)
 	$(MAKE) -C $(BUILD_DIR) install

Modified: pkg/trunk/3rdparty/ocl/Makefile
===================================================================
--- pkg/trunk/3rdparty/ocl/Makefile	2009-08-04 01:38:17 UTC (rev 20605)
+++ pkg/trunk/3rdparty/ocl/Makefile	2009-08-04 01:40:10 UTC (rev 20606)
@@ -13,7 +13,7 @@
 KDL_INSTALL=`rospack find kdl`/kdl
 BFL_INSTALL=`rospack find bfl`/bfl-boost
 
-CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(PWD)/$(INSTALL_DIR)/ \
+CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=`rospack find ocl`/$(INSTALL_DIR)/ \
 		-DOROCOS_TARGET=gnulinux \
 		-DCMAKE_BUILD_TYPE="RTT" \
 		-DOROCOS_INSTALL=$(OROCOS_INSTALL) \

Modified: pkg/trunk/3rdparty/player/Makefile
===================================================================
--- pkg/trunk/3rdparty/player/Makefile	2009-08-04 01:38:17 UTC (rev 20605)
+++ pkg/trunk/3rdparty/player/Makefile	2009-08-04 01:40:10 UTC (rev 20606)
@@ -18,7 +18,7 @@
 
 CMAKE = cmake 
 CMAKE_ARGS = -D CMAKE_BUILD_TYPE=RELEASE \
-             -D CMAKE_INSTALL_PREFIX=$(PWD)/player \
+             -D CMAKE_INSTALL_PREFIX=`rospack find player`/player \
 	     -D INCLUDE_RTK=OFF \
 	     -D BUILD_PLAYERCC=OFF \
 	     -D BUILD_UTILS=OFF \

Modified: pkg/trunk/3rdparty/rtt/Makefile
===================================================================
--- pkg/trunk/3rdparty/rtt/Makefile	2009-08-04 01:38:17 UTC (rev 20605)
+++ pkg/trunk/3rdparty/rtt/Makefile	2009-08-04 01:40:10 UTC (rev 20606)
@@ -6,7 +6,7 @@
 INSTALL_DIR = rtt
 CMAKE = cmake
 BOOST_INCLUDE =$(shell rosboost-cfg --include_dirs)
-CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(PWD)/$(INSTALL_DIR)/ \
+CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=`rospack find rtt`/$(INSTALL_DIR)/ \
 		-DOROCOS_TARGET=gnulinux \
 		-DBOOST_DIR=$(BOOST_INCLUDE)\
 		-DHAS_BOOST_SPIRIT=$(BOOST_INCLUDE)\

Modified: pkg/trunk/openrave_planning/openrave/Makefile
===================================================================
--- pkg/trunk/openrave_planning/openrave/Makefile	2009-08-04 01:38:17 UTC (rev 20605)
+++ pkg/trunk/openrave_planning/openrave/Makefile	2009-08-04 01:40:10 UTC (rev 20606)
@@ -29,7 +29,7 @@
 Version: 2.74\n\
 Libs: ${BULLET_LFLAGS}\n\
 CFlags: ${BULLET_CFLAGS}" > bullet.pc
-	cd $(SVN_DIR) && export PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(PWD)" && export PATH="$(shell rospack find soqt)/bin:$(shell rospack find opende)/opende/bin:$(PATH)" && mkdir -p build && cd build && BOOST_INCLUDEDIR=$(BOOST_INCLUDE_DIRS) BOOST_LIBRARYDIR=$(BOOST_LIBRARY_DIRS) cmake -DCMAKE_INSTALL_PREFIX=$(PWD) -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBoost_INCLUDE_DIR=$(BOOST_INCLUDE_DIRS) -DBoost_LIBRARY_DIR=$(BOOST_LIBRARY_DIRS) .. && export PARALLEL_JOBS=ROS_PARALLEL_JOBS && make $(ROS_PARALLEL_JOBS) install
+	cd $(SVN_DIR) && export PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):`rospack find openrave`" && export PATH="$(shell rospack find soqt)/bin:$(shell rospack find opende)/opende/bin:$(PATH)" && mkdir -p build && cd build && BOOST_INCLUDEDIR=$(BOOST_INCLUDE_DIRS) BOOST_LIBRARYDIR=$(BOOST_LIBRARY_DIRS) cmake -DCMAKE_INSTALL_PREFIX=`rospack find openrave` -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBoost_INCLUDE_DIR=$(BOOST_INCLUDE_DIRS) -DBoost_LIBRARY_DIR=$(BOOST_LIBRARY_DIRS) .. && export PARALLEL_JOBS=ROS_PARALLEL_JOBS && make $(ROS_PARALLEL_JOBS) install
 	touch installed
 
 clean:

Modified: pkg/trunk/openrave_planning/soqt/Makefile
===================================================================
--- pkg/trunk/openrave_planning/soqt/Makefile	2009-08-04 01:38:17 UTC (rev 20605)
+++ pkg/trunk/openrave_planning/soqt/Makefile	2009-08-04 01:40:10 UTC (rev 20606)
@@ -11,7 +11,7 @@
 
 installed: wiped $(SOURCE_DIR)/unpacked
 	cd $(SOURCE_DIR) && patch -s -N -p1 < ../../$(PATCH) || echo
-	cd $(SOURCE_DIR) && autoconf && ./configure --prefix=$(PWD)
+	cd $(SOURCE_DIR) && autoconf && ./configure --prefix=`rospack find soqt`
 	cd $(SOURCE_DIR) && make && make install
 	touch installed
 

Modified: pkg/trunk/stacks/camera_drivers/libdc1394v2/Makefile
===================================================================
--- pkg/trunk/stacks/camera_drivers/libdc1394v2/Makefile	2009-08-04 01:38:17 UTC (rev 20605)
+++ pkg/trunk/stacks/camera_drivers/libdc1394v2/Makefile	2009-08-04 01:40:10 UTC (rev 20606)
@@ -8,7 +8,7 @@
 
 installed: wiped $(SVN_DIR) patched
 	cd $(SVN_DIR) && autoreconf -i -s
-	cd $(SVN_DIR) && CFLAGS="-g -O2 -fPIC" ./configure --prefix=$(PWD)/libdc1394v2 --enable-shared=no
+	cd $(SVN_DIR) && CFLAGS="-g -O2 -fPIC" ./configure --prefix=`rospack find libdc1394v2`/libdc1394v2 --enable-shared=no
 	cd $(SVN_DIR) && ln -fs /usr/bin/libtool
 	cd $(SVN_DIR) && make
 	cd $(SVN_DIR) && make install

Modified: pkg/trunk/stacks/common/bfl/Makefile
===================================================================
--- pkg/trunk/stacks/common/bfl/Makefile	2009-08-04 01:38:17 UTC (rev 20605)
+++ pkg/trunk/stacks/common/bfl/Makefile	2009-08-04 01:40:10 UTC (rev 20606)
@@ -7,7 +7,7 @@
 INSTALL_DIR = bfl-boost
 CMAKE = cmake
 BOOST_INCLUDE =$(shell rosboost-cfg --include_dirs)
-CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(PWD)/$(INSTALL_DIR)/ \
+CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=`rospack find bfl`/$(INSTALL_DIR)/ \
  	-DCMAKE_INCLUDE_PATH=$(BOOST_INCLUDE) -DMATRIX_LIB=boost -DRNG_LIB=boost
 
 include $(shell rospack find mk)/svn_checkout.mk

Modified: pkg/trunk/stacks/laser_drivers/sicktoolbox/Makefile
===================================================================
--- pkg/trunk/stacks/laser_drivers/sicktoolbox/Makefile	2009-08-04 01:38:17 UTC (rev 20605)
+++ pkg/trunk/stacks/laser_drivers/sicktoolbox/Makefile	2009-08-04 01:40:10 UTC (rev 20606)
@@ -10,7 +10,7 @@
 include $(shell rospack find mk)/download_unpack_build.mk
 
 installed: wiped $(SOURCE_DIR)/unpacked
-	cd $(SOURCE_DIR) && ./configure --prefix=$(PWD)/sicktoolbox
+	cd $(SOURCE_DIR) && ./configure --prefix=`rospack find sicktoolbox`/sicktoolbox
 	cd $(SOURCE_DIR) && make && make install
 	touch installed
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


