From 7d260dc855eee755568ce3b02f5ef8e0476c6c6a Mon Sep 17 00:00:00 2001
From: rdiankov <devnull@localhost>
Date: Fri, 3 Dec 2010 12:32:02 +0000
Subject: [PATCH] updated colladadom include directories in makefile

---
 colladadom/Makefile     | 1 -
 colladadom/manifest.xml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/colladadom/Makefile b/colladadom/Makefile
index efb8121..44e95ec 100644
--- a/colladadom/Makefile
+++ b/colladadom/Makefile
@@ -29,7 +29,6 @@ installed: wiped $(SOURCE_DIR)/unpacked
 	@echo "making it"
 	cd $(SOURCE_DIR)/dom && make $(ROS_PARALLEL_JOBS)
 	cp -rf $(SOURCE_DIR)/dom/include/* $(ROOT)/include/
-	mv $(ROOT)/include/1.5/dom $(ROOT)/include/dom
 	cp -rf $(SOURCE_DIR)/dom/build/$(OS)-1.5/*.* $(ROOT)/lib/
 	touch installed
 
diff --git a/colladadom/manifest.xml b/colladadom/manifest.xml
index 194318d..c244c89 100644
--- a/colladadom/manifest.xml
+++ b/colladadom/manifest.xml
@@ -14,8 +14,8 @@
   <rosdep name="unzip"/>
   <rosdep name="pcre"/>
   <export>
-    <cpp lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lcollada15dom -lminizip `rosboost-cfg --lflags system` `rosboost-cfg --lflags filesystem`" cflags="-I${prefix}/include `rosboost-cfg --cflags`"/>
-    <cpp os="osx" lflags="-F${prefix}/lib -framework Collada15Dom" cflags="-I${prefix}/include"/>
+    <cpp lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lcollada15dom -lminizip `rosboost-cfg --lflags system` `rosboost-cfg --lflags filesystem`" cflags="-I${prefix}/include -I${prefix}/include/1.5 `rosboost-cfg --cflags`"/>
+    <cpp os="osx" lflags="-F${prefix}/lib -framework Collada15Dom" cflags="-I${prefix}/include -I${prefix}/include/1.5"/>
   </export>
   <platform os="ubuntu" version="9.04"/>
   <platform os="ubuntu" version="9.10"/>