From c710790cd71d68c7ce63503668d83e893fc0ee8a Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Mon, 23 Mar 2020 17:00:25 +0100 Subject: [PATCH] Makefile: dylibbundler - use -cd instead -od The use of --overwrite-dir was perhaps incorrect because it purges the directory. --create-dir is more suititable. --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index f3f1f0782..c1328697f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -576,7 +576,7 @@ bundle: bundle-nolib @if `which dylibbundler`; then \ export DYLD_LIBRARY_PATH=$(EXTRA_LIB_PATH); \ for n in $(BUNDLE)/Contents/MacOS/*; \ - do dylibbundler -of -p @executable_path/../libs/ -od -b -x $$n -d $(BUNDLE)/Contents/libs/; \ + do dylibbundler -of -p @executable_path/../libs/ -cd -b -x $$n -d $(BUNDLE)/Contents/libs/; \ done; \ for n in $(BUNDLE)/Contents/MacOS/* $(BUNDLE)/Contents/libs/*; do echo $$n; while $$( otool -L $$n | grep -q @rpath) ; \ do NAME=$$( otool -L $$n | grep @rpath| tail -n 1|cut -f 1 -d\ ); install_name_tool -change $$NAME $${NAME/@rpath/@executable_path\/..\/libs} $$n ; done; done ; \ @@ -598,7 +598,7 @@ bundle: bundle-nolib gui-bundle: bundle gui/QT/uv-qt @if `which dylibbundler`; then \ export DYLD_LIBRARY_PATH=$(EXTRA_LIB_PATH); \ - dylibbundler -of -p @executable_path/../libs/ -od -b -x $(GUI_BUNDLE)/Contents/MacOS/uv-qt -d $(GUI_BUNDLE)/Contents/libs/; \ + dylibbundler -of -p @executable_path/../libs/ -cd -b -x $(GUI_BUNDLE)/Contents/MacOS/uv-qt -d $(GUI_BUNDLE)/Contents/libs/; \ for n in $(GUI_BUNDLE)/Contents/MacOS/uv-qt $(GUI_BUNDLE)/Contents/libs/*; do echo $$n; while $$( otool -L $$n | grep -q @rpath) ; \ do NAME=$$( otool -L $$n | grep @rpath| tail -n 1|cut -f 1 -d\ ); install_name_tool -change $$NAME $${NAME/@rpath/@executable_path\/..\/libs} $$n ; done; done ; \ else \