diff --git a/QGCPostLinkCommon.pri b/QGCPostLinkCommon.pri index e0913ad..4816d61 100644 --- a/QGCPostLinkCommon.pri +++ b/QGCPostLinkCommon.pri @@ -172,8 +172,8 @@ LinuxBuild { include($$PWD/custom/custom_deploy.pri) } - QMAKE_POST_LINK += && SEARCHDIR="$$DESTDIR/Qt" RPATHDIR="$$DESTDIR/Qt/libs" "$$SOURCE_DIR/deploy/linux-fixup-rpaths.bash" + QMAKE_POST_LINK += && SEARCHDIR="$$DESTDIR/Qt" RPATHDIR="$$DESTDIR/Qt/libs" "$$PWD/deploy/linux-fixup-rpaths.bash" # https://doc.qt.io/qt-5/qt-conf.html - QMAKE_POST_LINK += && cp "$$SOURCE_DIR/deploy/qt.conf" "$$DESTDIR" + QMAKE_POST_LINK += && $$QMAKE_COPY "$$SOURCE_DIR/deploy/qt.conf" "$$DESTDIR" } diff --git a/deploy/linux-fixup-rpaths.bash b/deploy/linux-fixup-rpaths.bash index 61ddb11..5b566bf 100755 --- a/deploy/linux-fixup-rpaths.bash +++ b/deploy/linux-fixup-rpaths.bash @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/usr/bin/env bash # # Premise: # Shared libraries (Qt, airmap, etc) on Linux are built without knowing where