From 9c5b24ebdd04df158682e41bfded2c0ea2f23c1c Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 11 Jul 2012 10:34:55 +0200 Subject: [PATCH] Makefile: dylibbundler - check if replacement is needed --- Makefile.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index f3003a737..06e437018 100644 --- a/Makefile.in +++ b/Makefile.in @@ -400,11 +400,9 @@ bundle: all @if `which dylibbundler`; then \ dylibbundler -od -b -x $(BUNDLE)/Contents/MacOS/uv -d $(BUNDLE)/Contents/libs/; \ - if test -n @NVCC@; then \ - install_name_tool -change @rpath/libcudart.dylib @executable_path/../libs/libcudart.dylib $(BUNDLE)/Contents/MacOS/uv ; \ - install_name_tool -change @rpath/libnpp.dylib @executable_path/../libs/libnpp.dylib $(BUNDLE)/Contents/MacOS/uv ; \ - install_name_tool -change @rpath/libcudart.dylib @executable_path/../libs/libcudart.dylib $(BUNDLE)/Contents/libs/libnpp.dylib ; \ - fi; \ + if ( otool -L $(BUNDLE)/Contents/MacOS/uv | grep -q @rpath/libcudart.dylib ) ; then install_name_tool -change @rpath/libcudart.dylib @executable_path/../libs/libcudart.dylib $(BUNDLE)/Contents/MacOS/uv ; fi ; \ + if ( otool -L $(BUNDLE)/Contents/MacOS/uv | grep -q @rpath/libnpp.dylib ) ; then install_name_tool -change @rpath/libnpp.dylib @executable_path/../libs/libnpp.dylib $(BUNDLE)/Contents/MacOS/uv ; fi ; \ + if ( otool -L $(BUNDLE)/Contents/libs/libnpp.dylib | grep -q @rpath/libcudart.dylib ) ; then install_name_tool -change @rpath/libcudart.dylib @executable_path/../libs/libcudart.dylib $(BUNDLE)/Contents/libs/libnpp.dylib ; fi ; \ else \ echo "WARNING: Cannot find dylibbundler. We cannot put libraries into a bundle so it probably won't be portable."; \ fi