comparison deploy/linux/deploy-appimage.sh @ 1908:abddb04d2bf3

Use QTDIR as well
author Chris Cannam
date Fri, 29 Jun 2018 09:34:42 +0100
parents 9bd1dea5f412
children 12b96d6b1d66
comparison
equal deleted inserted replaced
1907:82a8b639c9ec 1908:abddb04d2bf3
76 add_dependencies "$program" 76 add_dependencies "$program"
77 77
78 cp -v "$targetdir/usr/local/lib/"* "$targetdir/usr/lib/" 78 cp -v "$targetdir/usr/local/lib/"* "$targetdir/usr/lib/"
79 79
80 qtplugins="gif icns ico jpeg tga tiff wbmp webp cocoa minimal offscreen xcb" 80 qtplugins="gif icns ico jpeg tga tiff wbmp webp cocoa minimal offscreen xcb"
81 qtlibdirs="/usr/lib/x86_64-linux-gnu/qt5 /usr/lib/x86_64-linux-gnu/qt /usr/lib/qt5 /usr/lib/qt" 81 qtlibdirs="$QTDIR /usr/lib/x86_64-linux-gnu/qt5 /usr/lib/x86_64-linux-gnu/qt /usr/lib/qt5 /usr/lib/qt"
82 82
83 for plug in $qtplugins; do 83 for plug in $qtplugins; do
84 for libdir in $qtlibdirs; do 84 for libdir in $qtlibdirs; do
85 lib=$(find $libdir/plugins -name libq$plug.so -print 2>/dev/null || true) 85 lib=$(find $libdir/plugins -name libq$plug.so -print 2>/dev/null || true)
86 if [ -n "$lib" ]; then 86 if [ -n "$lib" ]; then