Makefile: dylibbundler - use -cd instead -od

The use of --overwrite-dir was perhaps incorrect because it purges the
directory. --create-dir is more suititable.
This commit is contained in:
Martin Pulec
2020-03-23 17:00:25 +01:00
parent 3dcb349fdc
commit c710790cd7

View File

@@ -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 \