X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fmacosx%2Fcreate_dmg;h=f4b36b71c2f5fb871d37aef5c62030feee32882a;hb=HEAD;hp=2821533fe79920bce44fcc9505607cba0527e633;hpb=5872b25f6aefbcb9f68150f96f9aeae56e8e4337;p=sigrok-util.git

diff --git a/cross-compile/macosx/create_dmg b/cross-compile/macosx/create_dmg
index 2821533..be97673 100755
--- a/cross-compile/macosx/create_dmg
+++ b/cross-compile/macosx/create_dmg
@@ -69,23 +69,22 @@ PYDIR="$FRAMEWORKSDIR/Python.framework/Versions/$PYVER"
 mkdir -p $MACOSDIR $FRAMEWORKSDIR $SHARE_DIR
 
 cp $PREFIX/bin/$APPNAME_BINARY $MACOSDIR
+# Implementation detail: Shared libraries are handled below.
 cp -R $PREFIX/share/libsigrokdecode $SHARE_DIR
 rm -rf $SHARE_DIR/libsigrokdecode/decoders/**/__pycache__
 rm -rf $SHARE_DIR/libsigrokdecode/decoders/common/**/__pycache__
 cp -R $PREFIX/share/sigrok-firmware $SHARE_DIR
 
-if [ "x$1" = "xpulseview" ]; then
+if [ "x$APPNAME_BINARY" = "xpulseview" ]; then
 	# Manually copy some boost libs that "macdeployqt" won't copy.
 	cp $BOOSTLIBDIR/libboost_timer-mt.dylib $FRAMEWORKSDIR
 	cp $BOOSTLIBDIR/libboost_chrono-mt.dylib $FRAMEWORKSDIR
 	chmod 644 $FRAMEWORKSDIR/*boost*
-	
+
 	# Manually copy translations ("macdeployqt" won't copy them).
 	mkdir -p $CONTENTSDIR/translations
-	for lang in "de"; do
-		cp $QTTRANSLATIONSDIR/qt_$lang.qm $CONTENTSDIR/translations
-		cp $QTTRANSLATIONSDIR/qtbase_$lang.qm $CONTENTSDIR/translations
-	done
+	cp $QTTRANSLATIONSDIR/qt_*.qm $CONTENTSDIR/translations
+	cp $QTTRANSLATIONSDIR/qtbase_*.qm $CONTENTSDIR/translations
 fi
 
 $QTBINDIR/macdeployqt $APPNAME.app
@@ -114,6 +113,10 @@ install_name_tool -change \
 	/usr/local/opt/python/Frameworks/Python.framework/Versions/$PYVER/Python \
 	@executable_path/../Frameworks/Python.framework/Versions/$PYVER/Python \
 	$FRAMEWORKSDIR/libsigrokdecode.*.dylib
+install_name_tool -change \
+	/usr/local/opt/python/Frameworks/Python.framework/Versions/$PYVER/Python \
+	@executable_path/../Frameworks/Python.framework/Versions/$PYVER/Python \
+	$PREFIX/lib/libirmp.*.dylib
 
 # Add wrapper (sets PYTHONHOME/SIGROK_FIRMWARE_DIR/SIGROKDECODE_DIR).
 mv $MACOSDIR/$APPNAME_BINARY $MACOSDIR/$APPNAME_BINARY.real