mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-21 07:28:21 +08:00
Do not assume FHS in init-repository and configure
On systems that do not follow the Filesystem Hierarchy Standard, such as guix, the hardcoded `/bin/pwd` will fail to be found so that the script will fail. Use `pwd`, instead, so that the command can be found through the normal path search mechanism. Change-Id: I519d535bcaf53119c8800cc5545da9a0e48e677a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
2
configure
vendored
2
configure
vendored
@@ -3,7 +3,7 @@
|
|||||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||||
|
|
||||||
src_path=`dirname $0`
|
src_path=`dirname $0`
|
||||||
src_path=`(cd "$src_path"; /bin/pwd)`
|
src_path=`(cd "$src_path"; pwd)`
|
||||||
|
|
||||||
optfile=config.tl.opt
|
optfile=config.tl.opt
|
||||||
opttmpfile=config.tl.opt.in
|
opttmpfile=config.tl.opt.in
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
script_dir_path=`dirname $0`
|
script_dir_path=`dirname $0`
|
||||||
script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
|
script_dir_path=`(cd "$script_dir_path"; pwd)`
|
||||||
|
|
||||||
optfile=init-repository.opt
|
optfile=init-repository.opt
|
||||||
opttmpfile=init-repository.opt.in
|
opttmpfile=init-repository.opt.in
|
||||||
|
|||||||
Reference in New Issue
Block a user