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

[<tf...@us...>]

Revision: 20531
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=20531&view=rev
Author:   tfoote
Date:     2009-08-03 21:44:45 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
fixing Makefiles to allow make -C to work correctly

 r30001@axx (orig r20529):  tfoote | 2009-08-03 14:39:31 -0700
 fixing kdl makefile
 r30002@axx (orig r20530):  tfoote | 2009-08-03 14:42:10 -0700
 fixing opencv_latest Makefile

Modified Paths:
--------------
    pkg/trunk/stacks/geometry/kdl/Makefile
    pkg/trunk/stacks/opencv/opencv_latest/Makefile

Modified: pkg/trunk/stacks/geometry/kdl/Makefile
===================================================================
--- pkg/trunk/stacks/geometry/kdl/Makefile	2009-08-03 21:42:10 UTC (rev 20530)
+++ pkg/trunk/stacks/geometry/kdl/Makefile	2009-08-03 21:44:45 UTC (rev 20531)
@@ -10,7 +10,7 @@
 BOOST_INCLUDE =$(shell rosboost-cfg --include_dirs)
 EIGEN2_INCLUDE_DIR=`rospack find eigen`/build/eigen2/
 TINYXML_INCLUDE_DIR=`rospack find tinyxml`/include/
-CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(PWD)/$(INSTALL_DIR)/ \
+CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=`rospack find kdl`/$(INSTALL_DIR)/ \
 		-DPYTHON_BINDINGS=ON \
 		-DBUILD_MODELS=OFF \
 		-DENABLE_TESTS=ON \

Modified: pkg/trunk/stacks/opencv/opencv_latest/Makefile
===================================================================
--- pkg/trunk/stacks/opencv/opencv_latest/Makefile	2009-08-03 21:42:10 UTC (rev 20530)
+++ pkg/trunk/stacks/opencv/opencv_latest/Makefile	2009-08-03 21:44:45 UTC (rev 20531)
@@ -14,7 +14,7 @@
 
 CMAKE = cmake 
 CMAKE_ARGS = -D CMAKE_BUILD_TYPE=RELEASE \
-             -D CMAKE_INSTALL_PREFIX=$(PWD)/$(INSTALL_DIR) \
+             -D CMAKE_INSTALL_PREFIX=`rospack find opencv_latest`/$(INSTALL_DIR) \
              -D BUILD_PYTHON_SUPPORT=OFF
 
 installed: $(SVN_DIR) patched
@@ -22,8 +22,8 @@
 	cd $(SVN_DIR)/build && $(CMAKE) $(CMAKE_ARGS) ..
 	cd $(SVN_DIR)/build && make $(ROS_PARALLEL_JOBS) && make install
 	@echo "patch opencv.pc to pass -Wl,-rpath,-L{libdir}"
-	-mv $(PWD)/$(INSTALL_DIR)/lib/pkgconfig/opencv.pc $(PWD)/$(INSTALL_DIR)/lib/pkgconfig/opencv.bak
-	sed 's%Libs: -L$${libdir} -lcxcore%Libs: -Wl,-rpath,$${libdir} -L$${libdir} -lcxcore%g' $(PWD)/$(INSTALL_DIR)/lib/pkgconfig/opencv.bak > $(PWD)/$(INSTALL_DIR)/lib/pkgconfig/opencv.pc
+	-mv `rospack find opencv_latest`/$(INSTALL_DIR)/lib/pkgconfig/opencv.pc $(PWD)/$(INSTALL_DIR)/lib/pkgconfig/opencv.bak
+	sed 's%Libs: -L$${libdir} -lcxcore%Libs: -Wl,-rpath,$${libdir} -L$${libdir} -lcxcore%g' `rospack find opencv_latest`/$(INSTALL_DIR)/lib/pkgconfig/opencv.bak > `rospack find opencv_latest`/$(INSTALL_DIR)/lib/pkgconfig/opencv.pc
 	touch installed
 
 clean:


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