From 3ccb670e9274225d3a6ff3e0df19154733f7aa9d Mon Sep 17 00:00:00 2001 From: Alex Cunningham Date: Wed, 21 Dec 2011 14:06:37 +0000 Subject: [PATCH] changed wrap install script to use correct flags for cp on macs --- wrap/Makefile.am | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/wrap/Makefile.am b/wrap/Makefile.am index 40ed86998..ed6a68a27 100644 --- a/wrap/Makefile.am +++ b/wrap/Makefile.am @@ -84,6 +84,15 @@ mexextension += mex_bin endif endif # Linux +# Choose correct cp command by OS +cp_install = +if LINUX +cp_install += cp -ru +endif +if DARWIN +cp_install += cp -Rf +endif + all: generate_toolbox generate_toolbox: $(top_srcdir)/gtsam.h wrap @@ -96,7 +105,7 @@ wrap-install-matlab-toolbox: generate_toolbox install ${source_mode} -c ../toolbox/*.m ${toolbox}/gtsam install ${source_mode} -c ../toolbox/*.cpp ${toolbox}/gtsam install ${source_mode} -c ../toolbox/Makefile ${toolbox}/gtsam - cp -ru ../toolbox/@* ${toolbox}/gtsam + ${cp_install} ../toolbox/@* ${toolbox}/gtsam wrap-install-bin: wrap install -d ${wrap}