1 files changed, 2 insertions, 5 deletions
diff --git a/otp_build b/otp_build
index 57dc2e3a9c..28a229b101 100755
--- a/otp_build
+++ b/otp_build
@@ -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
@@ -1393,9 +1393,6 @@ case "$1" in
 		    TYPE=opt
 		fi;
 		FLAVOR=$1
-		if [ $FLAVOR = opt ]; then
-		    FLAVOR=plain
-		fi
 		do_boot;;
 	update_primary)
 		case $version_controller in