diff options
| author | Alexey Lebedeff <[email protected]> | 2016-04-21 18:11:58 +0300 |
|---|---|---|
| committer | Alexey Lebedeff <[email protected]> | 2016-04-21 18:45:23 +0300 |
| commit | 98b8650d22e94a5ff839170833f691294f6276d0 (patch) | |
| tree | a2efdc4e9fb8e072a4d7604d8661745bf4c2b7b6 /otp_build | |
| parent | 523e048754f5086a6cc4fd9a250e1b495fc5b9b8 (diff) | |
| download | otp-98b8650d22e94a5ff839170833f691294f6276d0.tar.gz otp-98b8650d22e94a5ff839170833f691294f6276d0.tar.bz2 otp-98b8650d22e94a5ff839170833f691294f6276d0.zip | |
Fix program paths used in build process
Not every OS has '/bin/rm' or '/bin/pwd' at exactly that location.
In some places in configure scripts result of AC_PATH_PROG was already
correctly used, this patch makes this usage more consistent.
As for `/bin/pwd` in `otp_build`, shell built-in one is already used in
mingw parts - so it should cause no harm to use it everywhere.
Difference is only in symlinks resolution - non-builtin `pwd` always
returns absolute path, and builtin-one could take into account what
sequence of user actions lead to current value of $PWD.
Diffstat (limited to 'otp_build')
| -rwxr-xr-x | otp_build | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -139,7 +139,7 @@ check_erltop () if [ "X$ERL_TOP" = "X" ]; then if [ -f ./otp_build -a -f ./erts/autoconf/config.guess ]; then ERLTOP_FORCED=true - ERL_TOP=`/bin/pwd` + ERL_TOP=`pwd` export ERL_TOP else echo "The environment variable ERL_TOP must be set." >&2 @@ -679,7 +679,7 @@ echo_env_erltop () if [ X"$ERL_TOP" = X"" -o "$ERLTOP_FORCED" = "true" ]; then if [ -f ./otp_build ]; then # Seems to be current directory... - echo_setenv ERL_TOP `/bin/pwd` ';' + echo_setenv ERL_TOP `pwd` ';' else echo "You need to either set ERL_TOP first or stand in the same" \ "directory as this script resides in." >&2 |