diff -ruN glibc-20050110/configure glibc-20050110.patched/configure --- glibc-20050110/configure 2005-01-05 10:39:53.000000000 +0100 +++ glibc-20050110.patched/configure 2005-01-18 13:33:01.000000000 +0100 @@ -1393,7 +1393,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -if test "`cd $srcdir; /bin/pwd`" = "`/bin/pwd`"; then +if test "`cd $srcdir; @PWD@`" = "`@PWD@`"; then { { echo "$as_me:$LINENO: error: you must configure in a separate build directory" >&5 echo "$as_me: error: you must configure in a separate build directory" >&2;} { (exit 1); exit 1; }; } diff -ruN glibc-20050110/io/ftwtest-sh glibc-20050110.patched/io/ftwtest-sh --- glibc-20050110/io/ftwtest-sh 2004-02-09 21:12:23.000000000 +0100 +++ glibc-20050110.patched/io/ftwtest-sh 2005-01-18 13:33:15.000000000 +0100 @@ -120,7 +120,7 @@ sort > $testout # perhaps $tmp involves some symlinks... -tmpreal=`cd $tmp; /bin/pwd 2>/dev/null || /usr/bin/pwd` +tmpreal=`cd $tmp; @PWD@ 2>/dev/null || /usr/bin/pwd` cat </dev/null || /usr/bin/pwd` +curwd=`@PWD@ 2>/dev/null || /usr/bin/pwd` cd "$tmp" LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d | sort > $testout @@ -160,7 +160,7 @@ EOF rm $testout -curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd` +curwd=`@PWD@ 2>/dev/null || /usr/bin/pwd` cd "$tmp" LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d/. | sort > $testout @@ -182,7 +182,7 @@ EOF rm $testout -curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd` +curwd=`@PWD@ 2>/dev/null || /usr/bin/pwd` cd "$tmp" LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d/foo/lvl1/link@1 | sort > $testout diff -ruN glibc-20050110/scripts/rellns-sh glibc-20050110.patched/scripts/rellns-sh --- glibc-20050110/scripts/rellns-sh 1999-12-19 00:40:25.000000000 +0100 +++ glibc-20050110.patched/scripts/rellns-sh 2005-01-18 13:35:53.245937423 +0100 @@ -22,13 +22,13 @@ exit 1 fi -if test -x /bin/pwd; then - pwd=/bin/pwd -elif test -x /usr/bin/pwd; then - pwd=/usr/bin/pwd -else +#if test -x /bin/pwd; then +# pwd=/bin/pwd +#elif test -x /usr/bin/pwd; then +# pwd=/usr/bin/pwd +#else pwd='pwd' -fi +#fi # Make both paths absolute. if test -d $1; then