Browse Source

rename searchdir to better provide its purpose

QGC4.4
Keith Bennett 3 years ago committed by Don Gagne
parent
commit
5468df16f1
  1. 8
      deploy/linux-fixup-rpaths.bash

8
deploy/linux-fixup-rpaths.bash

@ -30,9 +30,9 @@
set -euo pipefail set -euo pipefail
# To set these arguments, set them as an environment variable. For example: # To set these arguments, set them as an environment variable. For example:
# QTDIR=/opt/qgc-deploy/Qt RPATHDIR=/opt/qgc-deploy/Qt/libs QTCONF_PATH=/opt/qgc-deploy/qt.conf ./linux-post-link.sh # SEARCHDIR=/opt/qgc-deploy/Qt RPATHDIR=/opt/qgc-deploy/Qt/libs QTCONF_PATH=/opt/qgc-deploy/qt.conf ./linux-post-link.sh
: "${QTDIR:=./Qt}" : "${SEARCHDIR:=./Qt}"
: "${RPATHDIR:="${QTDIR}/libs"}" : "${RPATHDIR:="${SEARCHDIR}/libs"}"
: "${QTCONF_PATH:=./qt.conf}" : "${QTCONF_PATH:=./qt.conf}"
# find: # find:
@ -41,7 +41,7 @@ set -euo pipefail
# or that end with '.so.5' # or that end with '.so.5'
# and are executable # and are executable
# silence stderr (find will complain if it doesn't have permission to traverse) # silence stderr (find will complain if it doesn't have permission to traverse)
find "${QTDIR}" \ find "${SEARCHDIR}" \
-type f \ -type f \
-iname '*.so' \ -iname '*.so' \
-o -iname '*.so.5' \ -o -iname '*.so.5' \

Loading…
Cancel
Save