diff --git a/colladadom/Makefile b/colladadom/Makefile index 5c7e513..447fdc7 100644 --- a/colladadom/Makefile +++ b/colladadom/Makefile @@ -11,6 +11,17 @@ include $(shell rospack find mk)/download_unpack_build.mk ROOT = $(shell rospack find colladadom) +# Copied from dom/Makefile: +# os: 'linux', 'mac', 'windows', or 'ps3'. Use the 'uname' command to decide the +# default value. To detect when we're on Windows we'll check to see if we're +# running on Cygwin or MinGW. +OS := linux +ifneq ($(shell uname | grep -i darwin),) +OS := mac +else ifneq ($(or $(shell uname | grep -i cygwin),$(shell uname | grep -i mingw)),) +OS := windows +endif + installed: wiped $(SOURCE_DIR)/unpacked @echo "ROOT is: $(ROOT)" -mkdir -p $(ROOT)/include @@ -20,7 +31,7 @@ installed: wiped $(SOURCE_DIR)/unpacked 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 -f $(SOURCE_DIR)/dom/build/linux-1.5/*.* $(ROOT)/lib/ + cp -rf $(SOURCE_DIR)/dom/build/$(OS)-1.5/*.* $(ROOT)/lib/ touch installed wiped: Makefile