diff options
author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-06-08 15:26:54 -0700 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-12 20:06:39 +0200 |
commit | 6929fad9d9f98b43330c6d5a0d6b13b34fa90dc2 (patch) | |
tree | 96b0ef87695fedd2345425fd83f83bf8ef16d6b3 /configure | |
parent | 76b2d130ae67faa8d8904db5dbd6749f795365b8 (diff) |
-device: Use $1 instead of $VAL
$VAL just happens to work in resolveDeviceMkspec because it is
set in the parent shell environment when the function is called.
Change-Id: I67350f2a9e790cc7eca2a73ef6a4a0d7f09b8d3c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -252,15 +252,15 @@ DeviceVar() resolveDeviceMkspec() { - result=$(find "$relpath/mkspecs/devices/" -type d -name "*$VAL*" | sed "s,^$relpath/mkspecs/,,") + result=$(find "$relpath/mkspecs/devices/" -type d -name "*$1*" | sed "s,^$relpath/mkspecs/,,") match_count=$(echo "$result" | wc -w) if [ "$match_count" -gt 1 ]; then - echo >&2 "Error: Multiple matches for device '$VAL'. Candidates are:" + echo >&2 "Error: Multiple matches for device '$1'. Candidates are:" tabbed_result=$(echo "$result" | sed "s,^, ,") echo >&2 "$tabbed_result" echo "undefined" elif [ "$match_count" -eq 0 ]; then - echo >&2 "Error: No device matching '$VAL'" + echo >&2 "Error: No device matching '$1'" echo "undefined" else echo "$result" |