summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvintsov Dmitry <root@uralbash.ru>2016-12-22 21:03:53 +0500
committerLiang Qi <liang.qi@qt.io>2017-02-24 12:19:39 +0000
commit6c6169f292476046e62c6c62968ac72a914cb5a3 (patch)
tree4c73d03a561f83263456e720580f3b820f317f42
parentb5e631ad6ff9e8de3603f587e1ea268fc2935dc2 (diff)
Make top-level configure script more portable
Remove hard-coded path to pwd; there is no need to have it, and for example NixOS doesn't actually have it at this location, leading to such an error: ./configure: line 36: /bin/pwd: No such file or directory /qtbase/configure not found. Did you forget to run "init-repository"? Change-Id: If3372db3390ba5f39c5003d12ff2a466f39ff353 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index a7b4c9cb..b6954b85 100755
--- a/configure
+++ b/configure
@@ -33,7 +33,7 @@
#############################################################################
srcpath=`dirname $0`
-srcpath=`(cd "$srcpath"; /bin/pwd)`
+srcpath=`(cd "$srcpath"; pwd)`
configure=$srcpath/qtbase/configure
if [ ! -e "$configure" ]; then
echo "$configure not found. Did you forget to run \"init-repository\"?" >&2