OSDN Git Service

2003-07-04 H.J. Lu <hongjiu.lu@intel.com>
authorhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 4 Jul 2003 19:45:55 +0000 (19:45 +0000)
committerhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 4 Jul 2003 19:45:55 +0000 (19:45 +0000)
* Makefile.tpl: Replace PWD with PWD_COMMAND.
* Makefile.in: Regenerated.

gcc/

2003-07-04  H.J. Lu <hongjiu.lu@intel.com>

* config-ml.in: Replace PWD with PWD_COMMAND.
* Makefile.in: Likewise.

gcc/ada/

2003-07-04  H.J. Lu <hongjiu.lu@intel.com>

* Make-lang.in: Replace PWD with PWD_COMMAND.
* Makefile.adalib: Likewise.
* Makefile.in: Likewise.

gcc/treelang/

2003-07-04  H.J. Lu <hongjiu.lu@intel.com>

* Make-lang.in: Replace PWD with PWD_COMMAND.

libf2c/

2003-07-04  H.J. Lu <hongjiu.lu@intel.com>

* Makefile.in: Replace PWD with PWD_COMMAND.

libstdc++-v3/

2003-07-04  H.J. Lu <hongjiu.lu@intel.com>

* Makefile.am: Replace PWD with PWD_COMMAND.
* Makefile.in: Regenerated.
* docs/html/Makefile: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68931 138bc75d-0d04-0410-961f-82ee72b054a4

19 files changed:
ChangeLog
Makefile.in
Makefile.tpl
config-ml.in
gcc/ChangeLog
gcc/Makefile.in
gcc/ada/ChangeLog
gcc/ada/Make-lang.in
gcc/ada/Makefile.adalib
gcc/ada/Makefile.in
gcc/config.gcc
gcc/treelang/ChangeLog
gcc/treelang/Make-lang.in
libf2c/ChangeLog
libf2c/Makefile.in
libstdc++-v3/ChangeLog
libstdc++-v3/Makefile.am
libstdc++-v3/Makefile.in
libstdc++-v3/docs/html/Makefile

index a282bb7..8d386c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-04  H.J. Lu <hongjiu.lu@intel.com>
+
+       * Makefile.tpl: Replace PWD with PWD_COMMAND.
+       * Makefile.in: Regenerated.
+
 2003-07-04  Zack Weinberg  <zack@codesourcery.com>
 
        * intl: New directory; see intl/ChangeLog for details.
index 116d7cb..c46a6d9 100644 (file)
@@ -139,7 +139,9 @@ SHELL = @config_shell@
 # the environment to account for automounters.  The make variable must not
 # be called PWDCMD, otherwise the value set here is passed to make
 # subprocesses and overrides the setting from the user's environment.
-PWD = $${PWDCMD-pwd}
+# Don't use PWD since it is a common shell environment variable and we
+# don't want to corrupt it.
+PWD_COMMAND = $${PWDCMD-pwd}
 
 # compilers to use to create programs which must be run in the build
 # environment.
@@ -811,8 +813,8 @@ maybe-info-gcc:
 info-gcc: \
     configure-gcc 
        @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -834,8 +836,8 @@ maybe-info-ash:
 info-ash: \
     configure-ash 
        @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -856,8 +858,8 @@ maybe-info-autoconf:
 info-autoconf: \
     configure-autoconf 
        @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -878,8 +880,8 @@ maybe-info-automake:
 info-automake: \
     configure-automake 
        @[ -f ./automake/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -900,8 +902,8 @@ maybe-info-bash:
 info-bash: \
     configure-bash 
        @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -922,8 +924,8 @@ maybe-info-bfd:
 info-bfd: \
     configure-bfd 
        @[ -f ./bfd/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -944,8 +946,8 @@ maybe-info-opcodes:
 info-opcodes: \
     configure-opcodes 
        @[ -f ./opcodes/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -966,8 +968,8 @@ maybe-info-binutils:
 info-binutils: \
     configure-binutils 
        @[ -f ./binutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -988,8 +990,8 @@ maybe-info-bison:
 info-bison: \
     configure-bison 
        @[ -f ./bison/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1010,8 +1012,8 @@ maybe-info-byacc:
 info-byacc: \
     configure-byacc 
        @[ -f ./byacc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1032,8 +1034,8 @@ maybe-info-bzip2:
 info-bzip2: \
     configure-bzip2 
        @[ -f ./bzip2/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1054,8 +1056,8 @@ maybe-info-dejagnu:
 info-dejagnu: \
     configure-dejagnu 
        @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1076,8 +1078,8 @@ maybe-info-diff:
 info-diff: \
     configure-diff 
        @[ -f ./diff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1098,8 +1100,8 @@ maybe-info-dosutils:
 info-dosutils: \
     configure-dosutils 
        @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1120,8 +1122,8 @@ maybe-info-etc:
 info-etc: \
     configure-etc 
        @[ -f ./etc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1142,8 +1144,8 @@ maybe-info-fastjar:
 info-fastjar: \
     configure-fastjar 
        @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1164,8 +1166,8 @@ maybe-info-fileutils:
 info-fileutils: \
     configure-fileutils 
        @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1186,8 +1188,8 @@ maybe-info-findutils:
 info-findutils: \
     configure-findutils 
        @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1208,8 +1210,8 @@ maybe-info-find:
 info-find: \
     configure-find 
        @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1230,8 +1232,8 @@ maybe-info-flex:
 info-flex: \
     configure-flex 
        @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1252,8 +1254,8 @@ maybe-info-gas:
 info-gas: \
     configure-gas 
        @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1274,8 +1276,8 @@ maybe-info-gawk:
 info-gawk: \
     configure-gawk 
        @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1296,8 +1298,8 @@ maybe-info-gettext:
 info-gettext: \
     configure-gettext 
        @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1318,8 +1320,8 @@ maybe-info-gnuserv:
 info-gnuserv: \
     configure-gnuserv 
        @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1340,8 +1342,8 @@ maybe-info-gprof:
 info-gprof: \
     configure-gprof 
        @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1362,8 +1364,8 @@ maybe-info-gzip:
 info-gzip: \
     configure-gzip 
        @[ -f ./gzip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1384,8 +1386,8 @@ maybe-info-hello:
 info-hello: \
     configure-hello 
        @[ -f ./hello/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1406,8 +1408,8 @@ maybe-info-indent:
 info-indent: \
     configure-indent 
        @[ -f ./indent/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1428,8 +1430,8 @@ maybe-info-intl:
 info-intl: \
     configure-intl 
        @[ -f ./intl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1450,8 +1452,8 @@ maybe-info-tcl:
 info-tcl: \
     configure-tcl 
        @[ -f ./tcl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1472,8 +1474,8 @@ maybe-info-itcl:
 info-itcl: \
     configure-itcl 
        @[ -f ./itcl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1494,8 +1496,8 @@ maybe-info-ld:
 info-ld: \
     configure-ld 
        @[ -f ./ld/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1516,8 +1518,8 @@ maybe-info-libgui:
 info-libgui: \
     configure-libgui 
        @[ -f ./libgui/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1538,8 +1540,8 @@ maybe-info-libiberty:
 info-libiberty: \
     configure-libiberty 
        @[ -f ./libiberty/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1560,8 +1562,8 @@ maybe-info-libtool:
 info-libtool: \
     configure-libtool 
        @[ -f ./libtool/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1582,8 +1584,8 @@ maybe-info-m4:
 info-m4: \
     configure-m4 
        @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1604,8 +1606,8 @@ maybe-info-make:
 info-make: \
     configure-make 
        @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1626,8 +1628,8 @@ maybe-info-mmalloc:
 info-mmalloc: \
     configure-mmalloc 
        @[ -f ./mmalloc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1648,8 +1650,8 @@ maybe-info-patch:
 info-patch: \
     configure-patch 
        @[ -f ./patch/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1670,8 +1672,8 @@ maybe-info-perl:
 info-perl: \
     configure-perl 
        @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1692,8 +1694,8 @@ maybe-info-prms:
 info-prms: \
     configure-prms 
        @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1714,8 +1716,8 @@ maybe-info-rcs:
 info-rcs: \
     configure-rcs 
        @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1736,8 +1738,8 @@ maybe-info-readline:
 info-readline: \
     configure-readline 
        @[ -f ./readline/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1758,8 +1760,8 @@ maybe-info-release:
 info-release: \
     configure-release 
        @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1780,8 +1782,8 @@ maybe-info-recode:
 info-recode: \
     configure-recode 
        @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1802,8 +1804,8 @@ maybe-info-sed:
 info-sed: \
     configure-sed 
        @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1824,8 +1826,8 @@ maybe-info-send-pr:
 info-send-pr: \
     configure-send-pr 
        @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1846,8 +1848,8 @@ maybe-info-shellutils:
 info-shellutils: \
     configure-shellutils 
        @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1868,8 +1870,8 @@ maybe-info-sid:
 info-sid: \
     configure-sid 
        @[ -f ./sid/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1890,8 +1892,8 @@ maybe-info-sim:
 info-sim: \
     configure-sim 
        @[ -f ./sim/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1912,8 +1914,8 @@ maybe-info-tar:
 info-tar: \
     configure-tar 
        @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1934,8 +1936,8 @@ maybe-info-texinfo:
 info-texinfo: \
     configure-texinfo 
        @[ -f ./texinfo/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1956,8 +1958,8 @@ maybe-info-textutils:
 info-textutils: \
     configure-textutils 
        @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -1978,8 +1980,8 @@ maybe-info-time:
 info-time: \
     configure-time 
        @[ -f ./time/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2000,8 +2002,8 @@ maybe-info-uudecode:
 info-uudecode: \
     configure-uudecode 
        @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2022,8 +2024,8 @@ maybe-info-wdiff:
 info-wdiff: \
     configure-wdiff 
        @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2044,8 +2046,8 @@ maybe-info-zip:
 info-zip: \
     configure-zip 
        @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2066,8 +2068,8 @@ maybe-info-zlib:
 info-zlib: \
     configure-zlib 
        @[ -f ./zlib/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2088,8 +2090,8 @@ maybe-info-gdb:
 info-gdb: \
     configure-gdb 
        @[ -f ./gdb/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2110,8 +2112,8 @@ maybe-info-expect:
 info-expect: \
     configure-expect 
        @[ -f ./expect/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2132,8 +2134,8 @@ maybe-info-guile:
 info-guile: \
     configure-guile 
        @[ -f ./guile/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2154,8 +2156,8 @@ maybe-info-tk:
 info-tk: \
     configure-tk 
        @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2176,8 +2178,8 @@ maybe-info-tix:
 info-tix: \
     configure-tix 
        @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2198,8 +2200,8 @@ maybe-info-libtermcap:
 info-libtermcap: \
     configure-libtermcap 
        @[ -f ./libtermcap/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2220,8 +2222,8 @@ maybe-info-utils:
 info-utils: \
     configure-utils 
        @[ -f ./utils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2245,8 +2247,8 @@ maybe-info-target-libstdc++-v3:
 info-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
        @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2267,8 +2269,8 @@ maybe-info-target-newlib:
 info-target-newlib: \
     configure-target-newlib 
        @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2289,8 +2291,8 @@ maybe-info-target-libf2c:
 info-target-libf2c: \
     configure-target-libf2c 
        @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/libf2c" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2311,8 +2313,8 @@ maybe-info-target-libobjc:
 info-target-libobjc: \
     configure-target-libobjc 
        @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/libobjc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2333,8 +2335,8 @@ maybe-info-target-libtermcap:
 info-target-libtermcap: \
     configure-target-libtermcap 
        @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2355,8 +2357,8 @@ maybe-info-target-winsup:
 info-target-winsup: \
     configure-target-winsup 
        @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/winsup" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2377,8 +2379,8 @@ maybe-info-target-libgloss:
 info-target-libgloss: \
     configure-target-libgloss 
        @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/libgloss" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2399,8 +2401,8 @@ maybe-info-target-libiberty:
 info-target-libiberty: \
     configure-target-libiberty 
        @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/libiberty" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2421,8 +2423,8 @@ maybe-info-target-gperf:
 info-target-gperf: \
     configure-target-gperf 
        @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/gperf" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2443,8 +2445,8 @@ maybe-info-target-examples:
 info-target-examples: \
     configure-target-examples 
        @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/examples" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2465,8 +2467,8 @@ maybe-info-target-libffi:
 info-target-libffi: \
     configure-target-libffi 
        @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/libffi" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2487,8 +2489,8 @@ maybe-info-target-libjava:
 info-target-libjava: \
     configure-target-libjava 
        @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/libjava" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2509,8 +2511,8 @@ maybe-info-target-zlib:
 info-target-zlib: \
     configure-target-zlib 
        @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/zlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2531,8 +2533,8 @@ maybe-info-target-boehm-gc:
 info-target-boehm-gc: \
     configure-target-boehm-gc 
        @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/boehm-gc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2553,8 +2555,8 @@ maybe-info-target-qthreads:
 info-target-qthreads: \
     configure-target-qthreads 
        @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/qthreads" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2575,8 +2577,8 @@ maybe-info-target-rda:
 info-target-rda: \
     configure-target-rda 
        @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing info in $(TARGET_SUBDIR)/rda" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -2687,8 +2689,8 @@ maybe-dvi-gcc:
 dvi-gcc: \
     configure-gcc 
        @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2710,8 +2712,8 @@ maybe-dvi-ash:
 dvi-ash: \
     configure-ash 
        @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2732,8 +2734,8 @@ maybe-dvi-autoconf:
 dvi-autoconf: \
     configure-autoconf 
        @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2754,8 +2756,8 @@ maybe-dvi-automake:
 dvi-automake: \
     configure-automake 
        @[ -f ./automake/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2776,8 +2778,8 @@ maybe-dvi-bash:
 dvi-bash: \
     configure-bash 
        @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2798,8 +2800,8 @@ maybe-dvi-bfd:
 dvi-bfd: \
     configure-bfd 
        @[ -f ./bfd/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2820,8 +2822,8 @@ maybe-dvi-opcodes:
 dvi-opcodes: \
     configure-opcodes 
        @[ -f ./opcodes/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2842,8 +2844,8 @@ maybe-dvi-binutils:
 dvi-binutils: \
     configure-binutils 
        @[ -f ./binutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2864,8 +2866,8 @@ maybe-dvi-bison:
 dvi-bison: \
     configure-bison 
        @[ -f ./bison/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2886,8 +2888,8 @@ maybe-dvi-byacc:
 dvi-byacc: \
     configure-byacc 
        @[ -f ./byacc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2908,8 +2910,8 @@ maybe-dvi-bzip2:
 dvi-bzip2: \
     configure-bzip2 
        @[ -f ./bzip2/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2930,8 +2932,8 @@ maybe-dvi-dejagnu:
 dvi-dejagnu: \
     configure-dejagnu 
        @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2952,8 +2954,8 @@ maybe-dvi-diff:
 dvi-diff: \
     configure-diff 
        @[ -f ./diff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2974,8 +2976,8 @@ maybe-dvi-dosutils:
 dvi-dosutils: \
     configure-dosutils 
        @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -2996,8 +2998,8 @@ maybe-dvi-etc:
 dvi-etc: \
     configure-etc 
        @[ -f ./etc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3018,8 +3020,8 @@ maybe-dvi-fastjar:
 dvi-fastjar: \
     configure-fastjar 
        @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3040,8 +3042,8 @@ maybe-dvi-fileutils:
 dvi-fileutils: \
     configure-fileutils 
        @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3062,8 +3064,8 @@ maybe-dvi-findutils:
 dvi-findutils: \
     configure-findutils 
        @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3084,8 +3086,8 @@ maybe-dvi-find:
 dvi-find: \
     configure-find 
        @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3106,8 +3108,8 @@ maybe-dvi-flex:
 dvi-flex: \
     configure-flex 
        @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3128,8 +3130,8 @@ maybe-dvi-gas:
 dvi-gas: \
     configure-gas 
        @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3150,8 +3152,8 @@ maybe-dvi-gawk:
 dvi-gawk: \
     configure-gawk 
        @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3172,8 +3174,8 @@ maybe-dvi-gettext:
 dvi-gettext: \
     configure-gettext 
        @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3194,8 +3196,8 @@ maybe-dvi-gnuserv:
 dvi-gnuserv: \
     configure-gnuserv 
        @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3216,8 +3218,8 @@ maybe-dvi-gprof:
 dvi-gprof: \
     configure-gprof 
        @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3238,8 +3240,8 @@ maybe-dvi-gzip:
 dvi-gzip: \
     configure-gzip 
        @[ -f ./gzip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3260,8 +3262,8 @@ maybe-dvi-hello:
 dvi-hello: \
     configure-hello 
        @[ -f ./hello/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3282,8 +3284,8 @@ maybe-dvi-indent:
 dvi-indent: \
     configure-indent 
        @[ -f ./indent/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3304,8 +3306,8 @@ maybe-dvi-intl:
 dvi-intl: \
     configure-intl 
        @[ -f ./intl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3326,8 +3328,8 @@ maybe-dvi-tcl:
 dvi-tcl: \
     configure-tcl 
        @[ -f ./tcl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3348,8 +3350,8 @@ maybe-dvi-itcl:
 dvi-itcl: \
     configure-itcl 
        @[ -f ./itcl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3370,8 +3372,8 @@ maybe-dvi-ld:
 dvi-ld: \
     configure-ld 
        @[ -f ./ld/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3392,8 +3394,8 @@ maybe-dvi-libgui:
 dvi-libgui: \
     configure-libgui 
        @[ -f ./libgui/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3414,8 +3416,8 @@ maybe-dvi-libiberty:
 dvi-libiberty: \
     configure-libiberty 
        @[ -f ./libiberty/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3436,8 +3438,8 @@ maybe-dvi-libtool:
 dvi-libtool: \
     configure-libtool 
        @[ -f ./libtool/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3458,8 +3460,8 @@ maybe-dvi-m4:
 dvi-m4: \
     configure-m4 
        @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3480,8 +3482,8 @@ maybe-dvi-make:
 dvi-make: \
     configure-make 
        @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3502,8 +3504,8 @@ maybe-dvi-mmalloc:
 dvi-mmalloc: \
     configure-mmalloc 
        @[ -f ./mmalloc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3524,8 +3526,8 @@ maybe-dvi-patch:
 dvi-patch: \
     configure-patch 
        @[ -f ./patch/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3546,8 +3548,8 @@ maybe-dvi-perl:
 dvi-perl: \
     configure-perl 
        @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3568,8 +3570,8 @@ maybe-dvi-prms:
 dvi-prms: \
     configure-prms 
        @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3590,8 +3592,8 @@ maybe-dvi-rcs:
 dvi-rcs: \
     configure-rcs 
        @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3612,8 +3614,8 @@ maybe-dvi-readline:
 dvi-readline: \
     configure-readline 
        @[ -f ./readline/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3634,8 +3636,8 @@ maybe-dvi-release:
 dvi-release: \
     configure-release 
        @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3656,8 +3658,8 @@ maybe-dvi-recode:
 dvi-recode: \
     configure-recode 
        @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3678,8 +3680,8 @@ maybe-dvi-sed:
 dvi-sed: \
     configure-sed 
        @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3700,8 +3702,8 @@ maybe-dvi-send-pr:
 dvi-send-pr: \
     configure-send-pr 
        @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3722,8 +3724,8 @@ maybe-dvi-shellutils:
 dvi-shellutils: \
     configure-shellutils 
        @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3744,8 +3746,8 @@ maybe-dvi-sid:
 dvi-sid: \
     configure-sid 
        @[ -f ./sid/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3766,8 +3768,8 @@ maybe-dvi-sim:
 dvi-sim: \
     configure-sim 
        @[ -f ./sim/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3788,8 +3790,8 @@ maybe-dvi-tar:
 dvi-tar: \
     configure-tar 
        @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3810,8 +3812,8 @@ maybe-dvi-texinfo:
 dvi-texinfo: \
     configure-texinfo 
        @[ -f ./texinfo/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3832,8 +3834,8 @@ maybe-dvi-textutils:
 dvi-textutils: \
     configure-textutils 
        @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3854,8 +3856,8 @@ maybe-dvi-time:
 dvi-time: \
     configure-time 
        @[ -f ./time/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3876,8 +3878,8 @@ maybe-dvi-uudecode:
 dvi-uudecode: \
     configure-uudecode 
        @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3898,8 +3900,8 @@ maybe-dvi-wdiff:
 dvi-wdiff: \
     configure-wdiff 
        @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3920,8 +3922,8 @@ maybe-dvi-zip:
 dvi-zip: \
     configure-zip 
        @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3942,8 +3944,8 @@ maybe-dvi-zlib:
 dvi-zlib: \
     configure-zlib 
        @[ -f ./zlib/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3964,8 +3966,8 @@ maybe-dvi-gdb:
 dvi-gdb: \
     configure-gdb 
        @[ -f ./gdb/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -3986,8 +3988,8 @@ maybe-dvi-expect:
 dvi-expect: \
     configure-expect 
        @[ -f ./expect/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4008,8 +4010,8 @@ maybe-dvi-guile:
 dvi-guile: \
     configure-guile 
        @[ -f ./guile/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4030,8 +4032,8 @@ maybe-dvi-tk:
 dvi-tk: \
     configure-tk 
        @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4052,8 +4054,8 @@ maybe-dvi-tix:
 dvi-tix: \
     configure-tix 
        @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4074,8 +4076,8 @@ maybe-dvi-libtermcap:
 dvi-libtermcap: \
     configure-libtermcap 
        @[ -f ./libtermcap/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4096,8 +4098,8 @@ maybe-dvi-utils:
 dvi-utils: \
     configure-utils 
        @[ -f ./utils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4121,8 +4123,8 @@ maybe-dvi-target-libstdc++-v3:
 dvi-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
        @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4143,8 +4145,8 @@ maybe-dvi-target-newlib:
 dvi-target-newlib: \
     configure-target-newlib 
        @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4165,8 +4167,8 @@ maybe-dvi-target-libf2c:
 dvi-target-libf2c: \
     configure-target-libf2c 
        @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/libf2c" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4187,8 +4189,8 @@ maybe-dvi-target-libobjc:
 dvi-target-libobjc: \
     configure-target-libobjc 
        @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/libobjc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4209,8 +4211,8 @@ maybe-dvi-target-libtermcap:
 dvi-target-libtermcap: \
     configure-target-libtermcap 
        @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4231,8 +4233,8 @@ maybe-dvi-target-winsup:
 dvi-target-winsup: \
     configure-target-winsup 
        @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/winsup" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4253,8 +4255,8 @@ maybe-dvi-target-libgloss:
 dvi-target-libgloss: \
     configure-target-libgloss 
        @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/libgloss" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4275,8 +4277,8 @@ maybe-dvi-target-libiberty:
 dvi-target-libiberty: \
     configure-target-libiberty 
        @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/libiberty" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4297,8 +4299,8 @@ maybe-dvi-target-gperf:
 dvi-target-gperf: \
     configure-target-gperf 
        @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/gperf" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4319,8 +4321,8 @@ maybe-dvi-target-examples:
 dvi-target-examples: \
     configure-target-examples 
        @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/examples" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4341,8 +4343,8 @@ maybe-dvi-target-libffi:
 dvi-target-libffi: \
     configure-target-libffi 
        @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/libffi" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4363,8 +4365,8 @@ maybe-dvi-target-libjava:
 dvi-target-libjava: \
     configure-target-libjava 
        @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/libjava" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4385,8 +4387,8 @@ maybe-dvi-target-zlib:
 dvi-target-zlib: \
     configure-target-zlib 
        @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/zlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4407,8 +4409,8 @@ maybe-dvi-target-boehm-gc:
 dvi-target-boehm-gc: \
     configure-target-boehm-gc 
        @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/boehm-gc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4429,8 +4431,8 @@ maybe-dvi-target-qthreads:
 dvi-target-qthreads: \
     configure-target-qthreads 
        @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/qthreads" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4451,8 +4453,8 @@ maybe-dvi-target-rda:
 dvi-target-rda: \
     configure-target-rda 
        @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing dvi in $(TARGET_SUBDIR)/rda" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -4563,8 +4565,8 @@ maybe-TAGS-gcc:
 TAGS-gcc: \
     configure-gcc 
        @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4586,8 +4588,8 @@ maybe-TAGS-ash:
 TAGS-ash: \
     configure-ash 
        @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4608,8 +4610,8 @@ maybe-TAGS-autoconf:
 TAGS-autoconf: \
     configure-autoconf 
        @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4630,8 +4632,8 @@ maybe-TAGS-automake:
 TAGS-automake: \
     configure-automake 
        @[ -f ./automake/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4652,8 +4654,8 @@ maybe-TAGS-bash:
 TAGS-bash: \
     configure-bash 
        @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4674,8 +4676,8 @@ maybe-TAGS-bfd:
 TAGS-bfd: \
     configure-bfd 
        @[ -f ./bfd/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4696,8 +4698,8 @@ maybe-TAGS-opcodes:
 TAGS-opcodes: \
     configure-opcodes 
        @[ -f ./opcodes/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4718,8 +4720,8 @@ maybe-TAGS-binutils:
 TAGS-binutils: \
     configure-binutils 
        @[ -f ./binutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4740,8 +4742,8 @@ maybe-TAGS-bison:
 TAGS-bison: \
     configure-bison 
        @[ -f ./bison/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4762,8 +4764,8 @@ maybe-TAGS-byacc:
 TAGS-byacc: \
     configure-byacc 
        @[ -f ./byacc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4784,8 +4786,8 @@ maybe-TAGS-bzip2:
 TAGS-bzip2: \
     configure-bzip2 
        @[ -f ./bzip2/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4806,8 +4808,8 @@ maybe-TAGS-dejagnu:
 TAGS-dejagnu: \
     configure-dejagnu 
        @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4828,8 +4830,8 @@ maybe-TAGS-diff:
 TAGS-diff: \
     configure-diff 
        @[ -f ./diff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4850,8 +4852,8 @@ maybe-TAGS-dosutils:
 TAGS-dosutils: \
     configure-dosutils 
        @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4872,8 +4874,8 @@ maybe-TAGS-etc:
 TAGS-etc: \
     configure-etc 
        @[ -f ./etc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4894,8 +4896,8 @@ maybe-TAGS-fastjar:
 TAGS-fastjar: \
     configure-fastjar 
        @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4916,8 +4918,8 @@ maybe-TAGS-fileutils:
 TAGS-fileutils: \
     configure-fileutils 
        @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4938,8 +4940,8 @@ maybe-TAGS-findutils:
 TAGS-findutils: \
     configure-findutils 
        @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4960,8 +4962,8 @@ maybe-TAGS-find:
 TAGS-find: \
     configure-find 
        @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -4982,8 +4984,8 @@ maybe-TAGS-flex:
 TAGS-flex: \
     configure-flex 
        @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5004,8 +5006,8 @@ maybe-TAGS-gas:
 TAGS-gas: \
     configure-gas 
        @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5026,8 +5028,8 @@ maybe-TAGS-gawk:
 TAGS-gawk: \
     configure-gawk 
        @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5048,8 +5050,8 @@ maybe-TAGS-gettext:
 TAGS-gettext: \
     configure-gettext 
        @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5070,8 +5072,8 @@ maybe-TAGS-gnuserv:
 TAGS-gnuserv: \
     configure-gnuserv 
        @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5092,8 +5094,8 @@ maybe-TAGS-gprof:
 TAGS-gprof: \
     configure-gprof 
        @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5114,8 +5116,8 @@ maybe-TAGS-gzip:
 TAGS-gzip: \
     configure-gzip 
        @[ -f ./gzip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5136,8 +5138,8 @@ maybe-TAGS-hello:
 TAGS-hello: \
     configure-hello 
        @[ -f ./hello/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5158,8 +5160,8 @@ maybe-TAGS-indent:
 TAGS-indent: \
     configure-indent 
        @[ -f ./indent/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5180,8 +5182,8 @@ maybe-TAGS-intl:
 TAGS-intl: \
     configure-intl 
        @[ -f ./intl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5202,8 +5204,8 @@ maybe-TAGS-tcl:
 TAGS-tcl: \
     configure-tcl 
        @[ -f ./tcl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5224,8 +5226,8 @@ maybe-TAGS-itcl:
 TAGS-itcl: \
     configure-itcl 
        @[ -f ./itcl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5246,8 +5248,8 @@ maybe-TAGS-ld:
 TAGS-ld: \
     configure-ld 
        @[ -f ./ld/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5268,8 +5270,8 @@ maybe-TAGS-libgui:
 TAGS-libgui: \
     configure-libgui 
        @[ -f ./libgui/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5290,8 +5292,8 @@ maybe-TAGS-libiberty:
 TAGS-libiberty: \
     configure-libiberty 
        @[ -f ./libiberty/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5312,8 +5314,8 @@ maybe-TAGS-libtool:
 TAGS-libtool: \
     configure-libtool 
        @[ -f ./libtool/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5334,8 +5336,8 @@ maybe-TAGS-m4:
 TAGS-m4: \
     configure-m4 
        @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5356,8 +5358,8 @@ maybe-TAGS-make:
 TAGS-make: \
     configure-make 
        @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5378,8 +5380,8 @@ maybe-TAGS-mmalloc:
 TAGS-mmalloc: \
     configure-mmalloc 
        @[ -f ./mmalloc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5400,8 +5402,8 @@ maybe-TAGS-patch:
 TAGS-patch: \
     configure-patch 
        @[ -f ./patch/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5422,8 +5424,8 @@ maybe-TAGS-perl:
 TAGS-perl: \
     configure-perl 
        @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5444,8 +5446,8 @@ maybe-TAGS-prms:
 TAGS-prms: \
     configure-prms 
        @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5466,8 +5468,8 @@ maybe-TAGS-rcs:
 TAGS-rcs: \
     configure-rcs 
        @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5488,8 +5490,8 @@ maybe-TAGS-readline:
 TAGS-readline: \
     configure-readline 
        @[ -f ./readline/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5510,8 +5512,8 @@ maybe-TAGS-release:
 TAGS-release: \
     configure-release 
        @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5532,8 +5534,8 @@ maybe-TAGS-recode:
 TAGS-recode: \
     configure-recode 
        @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5554,8 +5556,8 @@ maybe-TAGS-sed:
 TAGS-sed: \
     configure-sed 
        @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5576,8 +5578,8 @@ maybe-TAGS-send-pr:
 TAGS-send-pr: \
     configure-send-pr 
        @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5598,8 +5600,8 @@ maybe-TAGS-shellutils:
 TAGS-shellutils: \
     configure-shellutils 
        @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5620,8 +5622,8 @@ maybe-TAGS-sid:
 TAGS-sid: \
     configure-sid 
        @[ -f ./sid/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5642,8 +5644,8 @@ maybe-TAGS-sim:
 TAGS-sim: \
     configure-sim 
        @[ -f ./sim/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5664,8 +5666,8 @@ maybe-TAGS-tar:
 TAGS-tar: \
     configure-tar 
        @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5686,8 +5688,8 @@ maybe-TAGS-texinfo:
 TAGS-texinfo: \
     configure-texinfo 
        @[ -f ./texinfo/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5708,8 +5710,8 @@ maybe-TAGS-textutils:
 TAGS-textutils: \
     configure-textutils 
        @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5730,8 +5732,8 @@ maybe-TAGS-time:
 TAGS-time: \
     configure-time 
        @[ -f ./time/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5752,8 +5754,8 @@ maybe-TAGS-uudecode:
 TAGS-uudecode: \
     configure-uudecode 
        @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5774,8 +5776,8 @@ maybe-TAGS-wdiff:
 TAGS-wdiff: \
     configure-wdiff 
        @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5796,8 +5798,8 @@ maybe-TAGS-zip:
 TAGS-zip: \
     configure-zip 
        @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5818,8 +5820,8 @@ maybe-TAGS-zlib:
 TAGS-zlib: \
     configure-zlib 
        @[ -f ./zlib/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5840,8 +5842,8 @@ maybe-TAGS-gdb:
 TAGS-gdb: \
     configure-gdb 
        @[ -f ./gdb/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5862,8 +5864,8 @@ maybe-TAGS-expect:
 TAGS-expect: \
     configure-expect 
        @[ -f ./expect/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5884,8 +5886,8 @@ maybe-TAGS-guile:
 TAGS-guile: \
     configure-guile 
        @[ -f ./guile/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5906,8 +5908,8 @@ maybe-TAGS-tk:
 TAGS-tk: \
     configure-tk 
        @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5928,8 +5930,8 @@ maybe-TAGS-tix:
 TAGS-tix: \
     configure-tix 
        @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5950,8 +5952,8 @@ maybe-TAGS-libtermcap:
 TAGS-libtermcap: \
     configure-libtermcap 
        @[ -f ./libtermcap/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5972,8 +5974,8 @@ maybe-TAGS-utils:
 TAGS-utils: \
     configure-utils 
        @[ -f ./utils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -5997,8 +5999,8 @@ maybe-TAGS-target-libstdc++-v3:
 TAGS-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
        @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6019,8 +6021,8 @@ maybe-TAGS-target-newlib:
 TAGS-target-newlib: \
     configure-target-newlib 
        @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6041,8 +6043,8 @@ maybe-TAGS-target-libf2c:
 TAGS-target-libf2c: \
     configure-target-libf2c 
        @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/libf2c" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6063,8 +6065,8 @@ maybe-TAGS-target-libobjc:
 TAGS-target-libobjc: \
     configure-target-libobjc 
        @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/libobjc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6085,8 +6087,8 @@ maybe-TAGS-target-libtermcap:
 TAGS-target-libtermcap: \
     configure-target-libtermcap 
        @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6107,8 +6109,8 @@ maybe-TAGS-target-winsup:
 TAGS-target-winsup: \
     configure-target-winsup 
        @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/winsup" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6129,8 +6131,8 @@ maybe-TAGS-target-libgloss:
 TAGS-target-libgloss: \
     configure-target-libgloss 
        @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/libgloss" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6151,8 +6153,8 @@ maybe-TAGS-target-libiberty:
 TAGS-target-libiberty: \
     configure-target-libiberty 
        @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/libiberty" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6173,8 +6175,8 @@ maybe-TAGS-target-gperf:
 TAGS-target-gperf: \
     configure-target-gperf 
        @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/gperf" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6195,8 +6197,8 @@ maybe-TAGS-target-examples:
 TAGS-target-examples: \
     configure-target-examples 
        @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/examples" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6217,8 +6219,8 @@ maybe-TAGS-target-libffi:
 TAGS-target-libffi: \
     configure-target-libffi 
        @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/libffi" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6239,8 +6241,8 @@ maybe-TAGS-target-libjava:
 TAGS-target-libjava: \
     configure-target-libjava 
        @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/libjava" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6261,8 +6263,8 @@ maybe-TAGS-target-zlib:
 TAGS-target-zlib: \
     configure-target-zlib 
        @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/zlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6283,8 +6285,8 @@ maybe-TAGS-target-boehm-gc:
 TAGS-target-boehm-gc: \
     configure-target-boehm-gc 
        @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/boehm-gc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6305,8 +6307,8 @@ maybe-TAGS-target-qthreads:
 TAGS-target-qthreads: \
     configure-target-qthreads 
        @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/qthreads" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6327,8 +6329,8 @@ maybe-TAGS-target-rda:
 TAGS-target-rda: \
     configure-target-rda 
        @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing TAGS in $(TARGET_SUBDIR)/rda" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -6440,8 +6442,8 @@ install-info-gcc: \
     configure-gcc \
     info-gcc 
        @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6464,8 +6466,8 @@ install-info-ash: \
     configure-ash \
     info-ash 
        @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6487,8 +6489,8 @@ install-info-autoconf: \
     configure-autoconf \
     info-autoconf 
        @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6510,8 +6512,8 @@ install-info-automake: \
     configure-automake \
     info-automake 
        @[ -f ./automake/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6533,8 +6535,8 @@ install-info-bash: \
     configure-bash \
     info-bash 
        @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6556,8 +6558,8 @@ install-info-bfd: \
     configure-bfd \
     info-bfd 
        @[ -f ./bfd/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6579,8 +6581,8 @@ install-info-opcodes: \
     configure-opcodes \
     info-opcodes 
        @[ -f ./opcodes/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6602,8 +6604,8 @@ install-info-binutils: \
     configure-binutils \
     info-binutils 
        @[ -f ./binutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6625,8 +6627,8 @@ install-info-bison: \
     configure-bison \
     info-bison 
        @[ -f ./bison/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6648,8 +6650,8 @@ install-info-byacc: \
     configure-byacc \
     info-byacc 
        @[ -f ./byacc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6671,8 +6673,8 @@ install-info-bzip2: \
     configure-bzip2 \
     info-bzip2 
        @[ -f ./bzip2/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6694,8 +6696,8 @@ install-info-dejagnu: \
     configure-dejagnu \
     info-dejagnu 
        @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6717,8 +6719,8 @@ install-info-diff: \
     configure-diff \
     info-diff 
        @[ -f ./diff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6740,8 +6742,8 @@ install-info-dosutils: \
     configure-dosutils \
     info-dosutils 
        @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6763,8 +6765,8 @@ install-info-etc: \
     configure-etc \
     info-etc 
        @[ -f ./etc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6786,8 +6788,8 @@ install-info-fastjar: \
     configure-fastjar \
     info-fastjar 
        @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6809,8 +6811,8 @@ install-info-fileutils: \
     configure-fileutils \
     info-fileutils 
        @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6832,8 +6834,8 @@ install-info-findutils: \
     configure-findutils \
     info-findutils 
        @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6855,8 +6857,8 @@ install-info-find: \
     configure-find \
     info-find 
        @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6878,8 +6880,8 @@ install-info-flex: \
     configure-flex \
     info-flex 
        @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6901,8 +6903,8 @@ install-info-gas: \
     configure-gas \
     info-gas 
        @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6924,8 +6926,8 @@ install-info-gawk: \
     configure-gawk \
     info-gawk 
        @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6947,8 +6949,8 @@ install-info-gettext: \
     configure-gettext \
     info-gettext 
        @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6970,8 +6972,8 @@ install-info-gnuserv: \
     configure-gnuserv \
     info-gnuserv 
        @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -6993,8 +6995,8 @@ install-info-gprof: \
     configure-gprof \
     info-gprof 
        @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7016,8 +7018,8 @@ install-info-gzip: \
     configure-gzip \
     info-gzip 
        @[ -f ./gzip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7039,8 +7041,8 @@ install-info-hello: \
     configure-hello \
     info-hello 
        @[ -f ./hello/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7062,8 +7064,8 @@ install-info-indent: \
     configure-indent \
     info-indent 
        @[ -f ./indent/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7085,8 +7087,8 @@ install-info-intl: \
     configure-intl \
     info-intl 
        @[ -f ./intl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7108,8 +7110,8 @@ install-info-tcl: \
     configure-tcl \
     info-tcl 
        @[ -f ./tcl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7131,8 +7133,8 @@ install-info-itcl: \
     configure-itcl \
     info-itcl 
        @[ -f ./itcl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7154,8 +7156,8 @@ install-info-ld: \
     configure-ld \
     info-ld 
        @[ -f ./ld/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7177,8 +7179,8 @@ install-info-libgui: \
     configure-libgui \
     info-libgui 
        @[ -f ./libgui/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7200,8 +7202,8 @@ install-info-libiberty: \
     configure-libiberty \
     info-libiberty 
        @[ -f ./libiberty/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7223,8 +7225,8 @@ install-info-libtool: \
     configure-libtool \
     info-libtool 
        @[ -f ./libtool/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7246,8 +7248,8 @@ install-info-m4: \
     configure-m4 \
     info-m4 
        @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7269,8 +7271,8 @@ install-info-make: \
     configure-make \
     info-make 
        @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7292,8 +7294,8 @@ install-info-mmalloc: \
     configure-mmalloc \
     info-mmalloc 
        @[ -f ./mmalloc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7315,8 +7317,8 @@ install-info-patch: \
     configure-patch \
     info-patch 
        @[ -f ./patch/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7338,8 +7340,8 @@ install-info-perl: \
     configure-perl \
     info-perl 
        @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7361,8 +7363,8 @@ install-info-prms: \
     configure-prms \
     info-prms 
        @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7384,8 +7386,8 @@ install-info-rcs: \
     configure-rcs \
     info-rcs 
        @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7407,8 +7409,8 @@ install-info-readline: \
     configure-readline \
     info-readline 
        @[ -f ./readline/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7430,8 +7432,8 @@ install-info-release: \
     configure-release \
     info-release 
        @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7453,8 +7455,8 @@ install-info-recode: \
     configure-recode \
     info-recode 
        @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7476,8 +7478,8 @@ install-info-sed: \
     configure-sed \
     info-sed 
        @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7499,8 +7501,8 @@ install-info-send-pr: \
     configure-send-pr \
     info-send-pr 
        @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7522,8 +7524,8 @@ install-info-shellutils: \
     configure-shellutils \
     info-shellutils 
        @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7545,8 +7547,8 @@ install-info-sid: \
     configure-sid \
     info-sid 
        @[ -f ./sid/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7568,8 +7570,8 @@ install-info-sim: \
     configure-sim \
     info-sim 
        @[ -f ./sim/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7591,8 +7593,8 @@ install-info-tar: \
     configure-tar \
     info-tar 
        @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7614,8 +7616,8 @@ install-info-texinfo: \
     configure-texinfo \
     info-texinfo 
        @[ -f ./texinfo/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7637,8 +7639,8 @@ install-info-textutils: \
     configure-textutils \
     info-textutils 
        @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7660,8 +7662,8 @@ install-info-time: \
     configure-time \
     info-time 
        @[ -f ./time/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7683,8 +7685,8 @@ install-info-uudecode: \
     configure-uudecode \
     info-uudecode 
        @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7706,8 +7708,8 @@ install-info-wdiff: \
     configure-wdiff \
     info-wdiff 
        @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7729,8 +7731,8 @@ install-info-zip: \
     configure-zip \
     info-zip 
        @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7752,8 +7754,8 @@ install-info-zlib: \
     configure-zlib \
     info-zlib 
        @[ -f ./zlib/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7775,8 +7777,8 @@ install-info-gdb: \
     configure-gdb \
     info-gdb 
        @[ -f ./gdb/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7798,8 +7800,8 @@ install-info-expect: \
     configure-expect \
     info-expect 
        @[ -f ./expect/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7821,8 +7823,8 @@ install-info-guile: \
     configure-guile \
     info-guile 
        @[ -f ./guile/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7844,8 +7846,8 @@ install-info-tk: \
     configure-tk \
     info-tk 
        @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7867,8 +7869,8 @@ install-info-tix: \
     configure-tix \
     info-tix 
        @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7890,8 +7892,8 @@ install-info-libtermcap: \
     configure-libtermcap \
     info-libtermcap 
        @[ -f ./libtermcap/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7913,8 +7915,8 @@ install-info-utils: \
     configure-utils \
     info-utils 
        @[ -f ./utils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -7939,8 +7941,8 @@ install-info-target-libstdc++-v3: \
     configure-target-libstdc++-v3 \
     info-target-libstdc++-v3 
        @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -7962,8 +7964,8 @@ install-info-target-newlib: \
     configure-target-newlib \
     info-target-newlib 
        @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -7985,8 +7987,8 @@ install-info-target-libf2c: \
     configure-target-libf2c \
     info-target-libf2c 
        @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/libf2c" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8008,8 +8010,8 @@ install-info-target-libobjc: \
     configure-target-libobjc \
     info-target-libobjc 
        @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/libobjc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8031,8 +8033,8 @@ install-info-target-libtermcap: \
     configure-target-libtermcap \
     info-target-libtermcap 
        @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8054,8 +8056,8 @@ install-info-target-winsup: \
     configure-target-winsup \
     info-target-winsup 
        @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/winsup" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8077,8 +8079,8 @@ install-info-target-libgloss: \
     configure-target-libgloss \
     info-target-libgloss 
        @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/libgloss" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8100,8 +8102,8 @@ install-info-target-libiberty: \
     configure-target-libiberty \
     info-target-libiberty 
        @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/libiberty" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8123,8 +8125,8 @@ install-info-target-gperf: \
     configure-target-gperf \
     info-target-gperf 
        @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/gperf" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8146,8 +8148,8 @@ install-info-target-examples: \
     configure-target-examples \
     info-target-examples 
        @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/examples" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8169,8 +8171,8 @@ install-info-target-libffi: \
     configure-target-libffi \
     info-target-libffi 
        @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/libffi" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8192,8 +8194,8 @@ install-info-target-libjava: \
     configure-target-libjava \
     info-target-libjava 
        @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/libjava" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8215,8 +8217,8 @@ install-info-target-zlib: \
     configure-target-zlib \
     info-target-zlib 
        @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/zlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8238,8 +8240,8 @@ install-info-target-boehm-gc: \
     configure-target-boehm-gc \
     info-target-boehm-gc 
        @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/boehm-gc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8261,8 +8263,8 @@ install-info-target-qthreads: \
     configure-target-qthreads \
     info-target-qthreads 
        @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/qthreads" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8284,8 +8286,8 @@ install-info-target-rda: \
     configure-target-rda \
     info-target-rda 
        @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing install-info in $(TARGET_SUBDIR)/rda" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -8396,8 +8398,8 @@ maybe-installcheck-gcc:
 installcheck-gcc: \
     configure-gcc 
        @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8419,8 +8421,8 @@ maybe-installcheck-ash:
 installcheck-ash: \
     configure-ash 
        @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8441,8 +8443,8 @@ maybe-installcheck-autoconf:
 installcheck-autoconf: \
     configure-autoconf 
        @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8463,8 +8465,8 @@ maybe-installcheck-automake:
 installcheck-automake: \
     configure-automake 
        @[ -f ./automake/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8485,8 +8487,8 @@ maybe-installcheck-bash:
 installcheck-bash: \
     configure-bash 
        @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8507,8 +8509,8 @@ maybe-installcheck-bfd:
 installcheck-bfd: \
     configure-bfd 
        @[ -f ./bfd/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8529,8 +8531,8 @@ maybe-installcheck-opcodes:
 installcheck-opcodes: \
     configure-opcodes 
        @[ -f ./opcodes/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8551,8 +8553,8 @@ maybe-installcheck-binutils:
 installcheck-binutils: \
     configure-binutils 
        @[ -f ./binutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8573,8 +8575,8 @@ maybe-installcheck-bison:
 installcheck-bison: \
     configure-bison 
        @[ -f ./bison/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8595,8 +8597,8 @@ maybe-installcheck-byacc:
 installcheck-byacc: \
     configure-byacc 
        @[ -f ./byacc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8617,8 +8619,8 @@ maybe-installcheck-bzip2:
 installcheck-bzip2: \
     configure-bzip2 
        @[ -f ./bzip2/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8639,8 +8641,8 @@ maybe-installcheck-dejagnu:
 installcheck-dejagnu: \
     configure-dejagnu 
        @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8661,8 +8663,8 @@ maybe-installcheck-diff:
 installcheck-diff: \
     configure-diff 
        @[ -f ./diff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8683,8 +8685,8 @@ maybe-installcheck-dosutils:
 installcheck-dosutils: \
     configure-dosutils 
        @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8705,8 +8707,8 @@ maybe-installcheck-etc:
 installcheck-etc: \
     configure-etc 
        @[ -f ./etc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8727,8 +8729,8 @@ maybe-installcheck-fastjar:
 installcheck-fastjar: \
     configure-fastjar 
        @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8749,8 +8751,8 @@ maybe-installcheck-fileutils:
 installcheck-fileutils: \
     configure-fileutils 
        @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8771,8 +8773,8 @@ maybe-installcheck-findutils:
 installcheck-findutils: \
     configure-findutils 
        @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8793,8 +8795,8 @@ maybe-installcheck-find:
 installcheck-find: \
     configure-find 
        @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8815,8 +8817,8 @@ maybe-installcheck-flex:
 installcheck-flex: \
     configure-flex 
        @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8837,8 +8839,8 @@ maybe-installcheck-gas:
 installcheck-gas: \
     configure-gas 
        @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8859,8 +8861,8 @@ maybe-installcheck-gawk:
 installcheck-gawk: \
     configure-gawk 
        @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8881,8 +8883,8 @@ maybe-installcheck-gettext:
 installcheck-gettext: \
     configure-gettext 
        @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8903,8 +8905,8 @@ maybe-installcheck-gnuserv:
 installcheck-gnuserv: \
     configure-gnuserv 
        @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8925,8 +8927,8 @@ maybe-installcheck-gprof:
 installcheck-gprof: \
     configure-gprof 
        @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8947,8 +8949,8 @@ maybe-installcheck-gzip:
 installcheck-gzip: \
     configure-gzip 
        @[ -f ./gzip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8969,8 +8971,8 @@ maybe-installcheck-hello:
 installcheck-hello: \
     configure-hello 
        @[ -f ./hello/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -8991,8 +8993,8 @@ maybe-installcheck-indent:
 installcheck-indent: \
     configure-indent 
        @[ -f ./indent/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9013,8 +9015,8 @@ maybe-installcheck-intl:
 installcheck-intl: \
     configure-intl 
        @[ -f ./intl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9035,8 +9037,8 @@ maybe-installcheck-tcl:
 installcheck-tcl: \
     configure-tcl 
        @[ -f ./tcl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9057,8 +9059,8 @@ maybe-installcheck-itcl:
 installcheck-itcl: \
     configure-itcl 
        @[ -f ./itcl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9079,8 +9081,8 @@ maybe-installcheck-ld:
 installcheck-ld: \
     configure-ld 
        @[ -f ./ld/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9101,8 +9103,8 @@ maybe-installcheck-libgui:
 installcheck-libgui: \
     configure-libgui 
        @[ -f ./libgui/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9123,8 +9125,8 @@ maybe-installcheck-libiberty:
 installcheck-libiberty: \
     configure-libiberty 
        @[ -f ./libiberty/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9145,8 +9147,8 @@ maybe-installcheck-libtool:
 installcheck-libtool: \
     configure-libtool 
        @[ -f ./libtool/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9167,8 +9169,8 @@ maybe-installcheck-m4:
 installcheck-m4: \
     configure-m4 
        @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9189,8 +9191,8 @@ maybe-installcheck-make:
 installcheck-make: \
     configure-make 
        @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9211,8 +9213,8 @@ maybe-installcheck-mmalloc:
 installcheck-mmalloc: \
     configure-mmalloc 
        @[ -f ./mmalloc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9233,8 +9235,8 @@ maybe-installcheck-patch:
 installcheck-patch: \
     configure-patch 
        @[ -f ./patch/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9255,8 +9257,8 @@ maybe-installcheck-perl:
 installcheck-perl: \
     configure-perl 
        @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9277,8 +9279,8 @@ maybe-installcheck-prms:
 installcheck-prms: \
     configure-prms 
        @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9299,8 +9301,8 @@ maybe-installcheck-rcs:
 installcheck-rcs: \
     configure-rcs 
        @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9321,8 +9323,8 @@ maybe-installcheck-readline:
 installcheck-readline: \
     configure-readline 
        @[ -f ./readline/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9343,8 +9345,8 @@ maybe-installcheck-release:
 installcheck-release: \
     configure-release 
        @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9365,8 +9367,8 @@ maybe-installcheck-recode:
 installcheck-recode: \
     configure-recode 
        @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9387,8 +9389,8 @@ maybe-installcheck-sed:
 installcheck-sed: \
     configure-sed 
        @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9409,8 +9411,8 @@ maybe-installcheck-send-pr:
 installcheck-send-pr: \
     configure-send-pr 
        @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9431,8 +9433,8 @@ maybe-installcheck-shellutils:
 installcheck-shellutils: \
     configure-shellutils 
        @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9453,8 +9455,8 @@ maybe-installcheck-sid:
 installcheck-sid: \
     configure-sid 
        @[ -f ./sid/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9475,8 +9477,8 @@ maybe-installcheck-sim:
 installcheck-sim: \
     configure-sim 
        @[ -f ./sim/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9497,8 +9499,8 @@ maybe-installcheck-tar:
 installcheck-tar: \
     configure-tar 
        @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9519,8 +9521,8 @@ maybe-installcheck-texinfo:
 installcheck-texinfo: \
     configure-texinfo 
        @[ -f ./texinfo/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9541,8 +9543,8 @@ maybe-installcheck-textutils:
 installcheck-textutils: \
     configure-textutils 
        @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9563,8 +9565,8 @@ maybe-installcheck-time:
 installcheck-time: \
     configure-time 
        @[ -f ./time/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9585,8 +9587,8 @@ maybe-installcheck-uudecode:
 installcheck-uudecode: \
     configure-uudecode 
        @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9607,8 +9609,8 @@ maybe-installcheck-wdiff:
 installcheck-wdiff: \
     configure-wdiff 
        @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9629,8 +9631,8 @@ maybe-installcheck-zip:
 installcheck-zip: \
     configure-zip 
        @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9651,8 +9653,8 @@ maybe-installcheck-zlib:
 installcheck-zlib: \
     configure-zlib 
        @[ -f ./zlib/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9673,8 +9675,8 @@ maybe-installcheck-gdb:
 installcheck-gdb: \
     configure-gdb 
        @[ -f ./gdb/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9695,8 +9697,8 @@ maybe-installcheck-expect:
 installcheck-expect: \
     configure-expect 
        @[ -f ./expect/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9717,8 +9719,8 @@ maybe-installcheck-guile:
 installcheck-guile: \
     configure-guile 
        @[ -f ./guile/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9739,8 +9741,8 @@ maybe-installcheck-tk:
 installcheck-tk: \
     configure-tk 
        @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9761,8 +9763,8 @@ maybe-installcheck-tix:
 installcheck-tix: \
     configure-tix 
        @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9783,8 +9785,8 @@ maybe-installcheck-libtermcap:
 installcheck-libtermcap: \
     configure-libtermcap 
        @[ -f ./libtermcap/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9805,8 +9807,8 @@ maybe-installcheck-utils:
 installcheck-utils: \
     configure-utils 
        @[ -f ./utils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -9830,8 +9832,8 @@ maybe-installcheck-target-libstdc++-v3:
 installcheck-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
        @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -9852,8 +9854,8 @@ maybe-installcheck-target-newlib:
 installcheck-target-newlib: \
     configure-target-newlib 
        @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -9874,8 +9876,8 @@ maybe-installcheck-target-libf2c:
 installcheck-target-libf2c: \
     configure-target-libf2c 
        @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/libf2c" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -9896,8 +9898,8 @@ maybe-installcheck-target-libobjc:
 installcheck-target-libobjc: \
     configure-target-libobjc 
        @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/libobjc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -9918,8 +9920,8 @@ maybe-installcheck-target-libtermcap:
 installcheck-target-libtermcap: \
     configure-target-libtermcap 
        @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/libtermcap" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -9940,8 +9942,8 @@ maybe-installcheck-target-winsup:
 installcheck-target-winsup: \
     configure-target-winsup 
        @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/winsup" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -9962,8 +9964,8 @@ maybe-installcheck-target-libgloss:
 installcheck-target-libgloss: \
     configure-target-libgloss 
        @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/libgloss" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -9984,8 +9986,8 @@ maybe-installcheck-target-libiberty:
 installcheck-target-libiberty: \
     configure-target-libiberty 
        @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/libiberty" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -10006,8 +10008,8 @@ maybe-installcheck-target-gperf:
 installcheck-target-gperf: \
     configure-target-gperf 
        @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/gperf" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -10028,8 +10030,8 @@ maybe-installcheck-target-examples:
 installcheck-target-examples: \
     configure-target-examples 
        @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/examples" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -10050,8 +10052,8 @@ maybe-installcheck-target-libffi:
 installcheck-target-libffi: \
     configure-target-libffi 
        @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/libffi" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -10072,8 +10074,8 @@ maybe-installcheck-target-libjava:
 installcheck-target-libjava: \
     configure-target-libjava 
        @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/libjava" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -10094,8 +10096,8 @@ maybe-installcheck-target-zlib:
 installcheck-target-zlib: \
     configure-target-zlib 
        @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/zlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -10116,8 +10118,8 @@ maybe-installcheck-target-boehm-gc:
 installcheck-target-boehm-gc: \
     configure-target-boehm-gc 
        @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/boehm-gc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -10138,8 +10140,8 @@ maybe-installcheck-target-qthreads:
 installcheck-target-qthreads: \
     configure-target-qthreads 
        @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/qthreads" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -10160,8 +10162,8 @@ maybe-installcheck-target-rda:
 installcheck-target-rda: \
     configure-target-rda 
        @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing installcheck in $(TARGET_SUBDIR)/rda" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -10271,8 +10273,8 @@ mostlyclean-target:  \
 maybe-mostlyclean-gcc:
 mostlyclean-gcc: 
        @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10293,8 +10295,8 @@ maybe-mostlyclean-ash:
 
 mostlyclean-ash: 
        @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10314,8 +10316,8 @@ maybe-mostlyclean-autoconf:
 
 mostlyclean-autoconf: 
        @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10335,8 +10337,8 @@ maybe-mostlyclean-automake:
 
 mostlyclean-automake: 
        @[ -f ./automake/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10356,8 +10358,8 @@ maybe-mostlyclean-bash:
 
 mostlyclean-bash: 
        @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10377,8 +10379,8 @@ maybe-mostlyclean-bfd:
 
 mostlyclean-bfd: 
        @[ -f ./bfd/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10398,8 +10400,8 @@ maybe-mostlyclean-opcodes:
 
 mostlyclean-opcodes: 
        @[ -f ./opcodes/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10419,8 +10421,8 @@ maybe-mostlyclean-binutils:
 
 mostlyclean-binutils: 
        @[ -f ./binutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10440,8 +10442,8 @@ maybe-mostlyclean-bison:
 
 mostlyclean-bison: 
        @[ -f ./bison/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10461,8 +10463,8 @@ maybe-mostlyclean-byacc:
 
 mostlyclean-byacc: 
        @[ -f ./byacc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10482,8 +10484,8 @@ maybe-mostlyclean-bzip2:
 
 mostlyclean-bzip2: 
        @[ -f ./bzip2/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10503,8 +10505,8 @@ maybe-mostlyclean-dejagnu:
 
 mostlyclean-dejagnu: 
        @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10524,8 +10526,8 @@ maybe-mostlyclean-diff:
 
 mostlyclean-diff: 
        @[ -f ./diff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10545,8 +10547,8 @@ maybe-mostlyclean-dosutils:
 
 mostlyclean-dosutils: 
        @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10566,8 +10568,8 @@ maybe-mostlyclean-etc:
 
 mostlyclean-etc: 
        @[ -f ./etc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10587,8 +10589,8 @@ maybe-mostlyclean-fastjar:
 
 mostlyclean-fastjar: 
        @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10608,8 +10610,8 @@ maybe-mostlyclean-fileutils:
 
 mostlyclean-fileutils: 
        @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10629,8 +10631,8 @@ maybe-mostlyclean-findutils:
 
 mostlyclean-findutils: 
        @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10650,8 +10652,8 @@ maybe-mostlyclean-find:
 
 mostlyclean-find: 
        @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10671,8 +10673,8 @@ maybe-mostlyclean-flex:
 
 mostlyclean-flex: 
        @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10692,8 +10694,8 @@ maybe-mostlyclean-gas:
 
 mostlyclean-gas: 
        @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10713,8 +10715,8 @@ maybe-mostlyclean-gawk:
 
 mostlyclean-gawk: 
        @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10734,8 +10736,8 @@ maybe-mostlyclean-gettext:
 
 mostlyclean-gettext: 
        @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10755,8 +10757,8 @@ maybe-mostlyclean-gnuserv:
 
 mostlyclean-gnuserv: 
        @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10776,8 +10778,8 @@ maybe-mostlyclean-gprof:
 
 mostlyclean-gprof: 
        @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10797,8 +10799,8 @@ maybe-mostlyclean-gzip:
 
 mostlyclean-gzip: 
        @[ -f ./gzip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10818,8 +10820,8 @@ maybe-mostlyclean-hello:
 
 mostlyclean-hello: 
        @[ -f ./hello/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10839,8 +10841,8 @@ maybe-mostlyclean-indent:
 
 mostlyclean-indent: 
        @[ -f ./indent/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10860,8 +10862,8 @@ maybe-mostlyclean-intl:
 
 mostlyclean-intl: 
        @[ -f ./intl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10888,8 +10890,8 @@ maybe-mostlyclean-itcl:
 
 mostlyclean-itcl: 
        @[ -f ./itcl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10909,8 +10911,8 @@ maybe-mostlyclean-ld:
 
 mostlyclean-ld: 
        @[ -f ./ld/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10930,8 +10932,8 @@ maybe-mostlyclean-libgui:
 
 mostlyclean-libgui: 
        @[ -f ./libgui/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10951,8 +10953,8 @@ maybe-mostlyclean-libiberty:
 
 mostlyclean-libiberty: 
        @[ -f ./libiberty/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10972,8 +10974,8 @@ maybe-mostlyclean-libtool:
 
 mostlyclean-libtool: 
        @[ -f ./libtool/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -10993,8 +10995,8 @@ maybe-mostlyclean-m4:
 
 mostlyclean-m4: 
        @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11014,8 +11016,8 @@ maybe-mostlyclean-make:
 
 mostlyclean-make: 
        @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11035,8 +11037,8 @@ maybe-mostlyclean-mmalloc:
 
 mostlyclean-mmalloc: 
        @[ -f ./mmalloc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11056,8 +11058,8 @@ maybe-mostlyclean-patch:
 
 mostlyclean-patch: 
        @[ -f ./patch/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11077,8 +11079,8 @@ maybe-mostlyclean-perl:
 
 mostlyclean-perl: 
        @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11098,8 +11100,8 @@ maybe-mostlyclean-prms:
 
 mostlyclean-prms: 
        @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11119,8 +11121,8 @@ maybe-mostlyclean-rcs:
 
 mostlyclean-rcs: 
        @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11140,8 +11142,8 @@ maybe-mostlyclean-readline:
 
 mostlyclean-readline: 
        @[ -f ./readline/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11161,8 +11163,8 @@ maybe-mostlyclean-release:
 
 mostlyclean-release: 
        @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11182,8 +11184,8 @@ maybe-mostlyclean-recode:
 
 mostlyclean-recode: 
        @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11203,8 +11205,8 @@ maybe-mostlyclean-sed:
 
 mostlyclean-sed: 
        @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11224,8 +11226,8 @@ maybe-mostlyclean-send-pr:
 
 mostlyclean-send-pr: 
        @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11245,8 +11247,8 @@ maybe-mostlyclean-shellutils:
 
 mostlyclean-shellutils: 
        @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11266,8 +11268,8 @@ maybe-mostlyclean-sid:
 
 mostlyclean-sid: 
        @[ -f ./sid/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11287,8 +11289,8 @@ maybe-mostlyclean-sim:
 
 mostlyclean-sim: 
        @[ -f ./sim/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11308,8 +11310,8 @@ maybe-mostlyclean-tar:
 
 mostlyclean-tar: 
        @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11329,8 +11331,8 @@ maybe-mostlyclean-texinfo:
 
 mostlyclean-texinfo: 
        @[ -f ./texinfo/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11350,8 +11352,8 @@ maybe-mostlyclean-textutils:
 
 mostlyclean-textutils: 
        @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11371,8 +11373,8 @@ maybe-mostlyclean-time:
 
 mostlyclean-time: 
        @[ -f ./time/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11392,8 +11394,8 @@ maybe-mostlyclean-uudecode:
 
 mostlyclean-uudecode: 
        @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11413,8 +11415,8 @@ maybe-mostlyclean-wdiff:
 
 mostlyclean-wdiff: 
        @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11434,8 +11436,8 @@ maybe-mostlyclean-zip:
 
 mostlyclean-zip: 
        @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11455,8 +11457,8 @@ maybe-mostlyclean-zlib:
 
 mostlyclean-zlib: 
        @[ -f ./zlib/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11476,8 +11478,8 @@ maybe-mostlyclean-gdb:
 
 mostlyclean-gdb: 
        @[ -f ./gdb/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11497,8 +11499,8 @@ maybe-mostlyclean-expect:
 
 mostlyclean-expect: 
        @[ -f ./expect/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11518,8 +11520,8 @@ maybe-mostlyclean-guile:
 
 mostlyclean-guile: 
        @[ -f ./guile/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11539,8 +11541,8 @@ maybe-mostlyclean-tk:
 
 mostlyclean-tk: 
        @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11560,8 +11562,8 @@ maybe-mostlyclean-tix:
 
 mostlyclean-tix: 
        @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11588,8 +11590,8 @@ maybe-mostlyclean-utils:
 
 mostlyclean-utils: 
        @[ -f ./utils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -11612,8 +11614,8 @@ maybe-mostlyclean-target-libstdc++-v3:
 
 mostlyclean-target-libstdc++-v3: 
        @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11633,8 +11635,8 @@ maybe-mostlyclean-target-newlib:
 
 mostlyclean-target-newlib: 
        @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11654,8 +11656,8 @@ maybe-mostlyclean-target-libf2c:
 
 mostlyclean-target-libf2c: 
        @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/libf2c" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11675,8 +11677,8 @@ maybe-mostlyclean-target-libobjc:
 
 mostlyclean-target-libobjc: 
        @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/libobjc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11703,8 +11705,8 @@ maybe-mostlyclean-target-winsup:
 
 mostlyclean-target-winsup: 
        @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/winsup" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11724,8 +11726,8 @@ maybe-mostlyclean-target-libgloss:
 
 mostlyclean-target-libgloss: 
        @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgloss" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11745,8 +11747,8 @@ maybe-mostlyclean-target-libiberty:
 
 mostlyclean-target-libiberty: 
        @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/libiberty" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11766,8 +11768,8 @@ maybe-mostlyclean-target-gperf:
 
 mostlyclean-target-gperf: 
        @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/gperf" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11787,8 +11789,8 @@ maybe-mostlyclean-target-examples:
 
 mostlyclean-target-examples: 
        @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/examples" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11808,8 +11810,8 @@ maybe-mostlyclean-target-libffi:
 
 mostlyclean-target-libffi: 
        @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/libffi" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11829,8 +11831,8 @@ maybe-mostlyclean-target-libjava:
 
 mostlyclean-target-libjava: 
        @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/libjava" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11850,8 +11852,8 @@ maybe-mostlyclean-target-zlib:
 
 mostlyclean-target-zlib: 
        @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/zlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11871,8 +11873,8 @@ maybe-mostlyclean-target-boehm-gc:
 
 mostlyclean-target-boehm-gc: 
        @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/boehm-gc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11892,8 +11894,8 @@ maybe-mostlyclean-target-qthreads:
 
 mostlyclean-target-qthreads: 
        @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/qthreads" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -11913,8 +11915,8 @@ maybe-mostlyclean-target-rda:
 
 mostlyclean-target-rda: 
        @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing mostlyclean in $(TARGET_SUBDIR)/rda" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -12024,8 +12026,8 @@ clean-target:  \
 maybe-clean-gcc:
 clean-gcc: 
        @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12046,8 +12048,8 @@ maybe-clean-ash:
 
 clean-ash: 
        @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12067,8 +12069,8 @@ maybe-clean-autoconf:
 
 clean-autoconf: 
        @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12088,8 +12090,8 @@ maybe-clean-automake:
 
 clean-automake: 
        @[ -f ./automake/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12109,8 +12111,8 @@ maybe-clean-bash:
 
 clean-bash: 
        @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12130,8 +12132,8 @@ maybe-clean-bfd:
 
 clean-bfd: 
        @[ -f ./bfd/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12151,8 +12153,8 @@ maybe-clean-opcodes:
 
 clean-opcodes: 
        @[ -f ./opcodes/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12172,8 +12174,8 @@ maybe-clean-binutils:
 
 clean-binutils: 
        @[ -f ./binutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12193,8 +12195,8 @@ maybe-clean-bison:
 
 clean-bison: 
        @[ -f ./bison/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12214,8 +12216,8 @@ maybe-clean-byacc:
 
 clean-byacc: 
        @[ -f ./byacc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12235,8 +12237,8 @@ maybe-clean-bzip2:
 
 clean-bzip2: 
        @[ -f ./bzip2/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12256,8 +12258,8 @@ maybe-clean-dejagnu:
 
 clean-dejagnu: 
        @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12277,8 +12279,8 @@ maybe-clean-diff:
 
 clean-diff: 
        @[ -f ./diff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12298,8 +12300,8 @@ maybe-clean-dosutils:
 
 clean-dosutils: 
        @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12319,8 +12321,8 @@ maybe-clean-etc:
 
 clean-etc: 
        @[ -f ./etc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12340,8 +12342,8 @@ maybe-clean-fastjar:
 
 clean-fastjar: 
        @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12361,8 +12363,8 @@ maybe-clean-fileutils:
 
 clean-fileutils: 
        @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12382,8 +12384,8 @@ maybe-clean-findutils:
 
 clean-findutils: 
        @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12403,8 +12405,8 @@ maybe-clean-find:
 
 clean-find: 
        @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12424,8 +12426,8 @@ maybe-clean-flex:
 
 clean-flex: 
        @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12445,8 +12447,8 @@ maybe-clean-gas:
 
 clean-gas: 
        @[ -f ./gas/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12466,8 +12468,8 @@ maybe-clean-gawk:
 
 clean-gawk: 
        @[ -f ./gawk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12487,8 +12489,8 @@ maybe-clean-gettext:
 
 clean-gettext: 
        @[ -f ./gettext/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12508,8 +12510,8 @@ maybe-clean-gnuserv:
 
 clean-gnuserv: 
        @[ -f ./gnuserv/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12529,8 +12531,8 @@ maybe-clean-gprof:
 
 clean-gprof: 
        @[ -f ./gprof/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12550,8 +12552,8 @@ maybe-clean-gzip:
 
 clean-gzip: 
        @[ -f ./gzip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12571,8 +12573,8 @@ maybe-clean-hello:
 
 clean-hello: 
        @[ -f ./hello/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12592,8 +12594,8 @@ maybe-clean-indent:
 
 clean-indent: 
        @[ -f ./indent/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12613,8 +12615,8 @@ maybe-clean-intl:
 
 clean-intl: 
        @[ -f ./intl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12634,8 +12636,8 @@ maybe-clean-tcl:
 
 clean-tcl: 
        @[ -f ./tcl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12655,8 +12657,8 @@ maybe-clean-itcl:
 
 clean-itcl: 
        @[ -f ./itcl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12676,8 +12678,8 @@ maybe-clean-ld:
 
 clean-ld: 
        @[ -f ./ld/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12697,8 +12699,8 @@ maybe-clean-libgui:
 
 clean-libgui: 
        @[ -f ./libgui/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12718,8 +12720,8 @@ maybe-clean-libiberty:
 
 clean-libiberty: 
        @[ -f ./libiberty/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12739,8 +12741,8 @@ maybe-clean-libtool:
 
 clean-libtool: 
        @[ -f ./libtool/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12760,8 +12762,8 @@ maybe-clean-m4:
 
 clean-m4: 
        @[ -f ./m4/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12781,8 +12783,8 @@ maybe-clean-make:
 
 clean-make: 
        @[ -f ./make/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12802,8 +12804,8 @@ maybe-clean-mmalloc:
 
 clean-mmalloc: 
        @[ -f ./mmalloc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12823,8 +12825,8 @@ maybe-clean-patch:
 
 clean-patch: 
        @[ -f ./patch/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12844,8 +12846,8 @@ maybe-clean-perl:
 
 clean-perl: 
        @[ -f ./perl/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12865,8 +12867,8 @@ maybe-clean-prms:
 
 clean-prms: 
        @[ -f ./prms/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12886,8 +12888,8 @@ maybe-clean-rcs:
 
 clean-rcs: 
        @[ -f ./rcs/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12907,8 +12909,8 @@ maybe-clean-readline:
 
 clean-readline: 
        @[ -f ./readline/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12928,8 +12930,8 @@ maybe-clean-release:
 
 clean-release: 
        @[ -f ./release/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12949,8 +12951,8 @@ maybe-clean-recode:
 
 clean-recode: 
        @[ -f ./recode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12970,8 +12972,8 @@ maybe-clean-sed:
 
 clean-sed: 
        @[ -f ./sed/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -12991,8 +12993,8 @@ maybe-clean-send-pr:
 
 clean-send-pr: 
        @[ -f ./send-pr/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13012,8 +13014,8 @@ maybe-clean-shellutils:
 
 clean-shellutils: 
        @[ -f ./shellutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13033,8 +13035,8 @@ maybe-clean-sid:
 
 clean-sid: 
        @[ -f ./sid/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13054,8 +13056,8 @@ maybe-clean-sim:
 
 clean-sim: 
        @[ -f ./sim/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13075,8 +13077,8 @@ maybe-clean-tar:
 
 clean-tar: 
        @[ -f ./tar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13096,8 +13098,8 @@ maybe-clean-texinfo:
 
 clean-texinfo: 
        @[ -f ./texinfo/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13117,8 +13119,8 @@ maybe-clean-textutils:
 
 clean-textutils: 
        @[ -f ./textutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13138,8 +13140,8 @@ maybe-clean-time:
 
 clean-time: 
        @[ -f ./time/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13159,8 +13161,8 @@ maybe-clean-uudecode:
 
 clean-uudecode: 
        @[ -f ./uudecode/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13180,8 +13182,8 @@ maybe-clean-wdiff:
 
 clean-wdiff: 
        @[ -f ./wdiff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13201,8 +13203,8 @@ maybe-clean-zip:
 
 clean-zip: 
        @[ -f ./zip/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13222,8 +13224,8 @@ maybe-clean-zlib:
 
 clean-zlib: 
        @[ -f ./zlib/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13243,8 +13245,8 @@ maybe-clean-gdb:
 
 clean-gdb: 
        @[ -f ./gdb/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13264,8 +13266,8 @@ maybe-clean-expect:
 
 clean-expect: 
        @[ -f ./expect/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13285,8 +13287,8 @@ maybe-clean-guile:
 
 clean-guile: 
        @[ -f ./guile/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13306,8 +13308,8 @@ maybe-clean-tk:
 
 clean-tk: 
        @[ -f ./tk/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13327,8 +13329,8 @@ maybe-clean-tix:
 
 clean-tix: 
        @[ -f ./tix/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13355,8 +13357,8 @@ maybe-clean-utils:
 
 clean-utils: 
        @[ -f ./utils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13379,8 +13381,8 @@ maybe-clean-target-libstdc++-v3:
 
 clean-target-libstdc++-v3: 
        @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13400,8 +13402,8 @@ maybe-clean-target-newlib:
 
 clean-target-newlib: 
        @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/newlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13421,8 +13423,8 @@ maybe-clean-target-libf2c:
 
 clean-target-libf2c: 
        @[ -f $(TARGET_SUBDIR)/libf2c/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/libf2c" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13442,8 +13444,8 @@ maybe-clean-target-libobjc:
 
 clean-target-libobjc: 
        @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/libobjc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13470,8 +13472,8 @@ maybe-clean-target-winsup:
 
 clean-target-winsup: 
        @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/winsup" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13491,8 +13493,8 @@ maybe-clean-target-libgloss:
 
 clean-target-libgloss: 
        @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/libgloss" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13512,8 +13514,8 @@ maybe-clean-target-libiberty:
 
 clean-target-libiberty: 
        @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/libiberty" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13533,8 +13535,8 @@ maybe-clean-target-gperf:
 
 clean-target-gperf: 
        @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/gperf" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13554,8 +13556,8 @@ maybe-clean-target-examples:
 
 clean-target-examples: 
        @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/examples" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13575,8 +13577,8 @@ maybe-clean-target-libffi:
 
 clean-target-libffi: 
        @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/libffi" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13596,8 +13598,8 @@ maybe-clean-target-libjava:
 
 clean-target-libjava: 
        @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/libjava" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13617,8 +13619,8 @@ maybe-clean-target-zlib:
 
 clean-target-zlib: 
        @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/zlib" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13638,8 +13640,8 @@ maybe-clean-target-boehm-gc:
 
 clean-target-boehm-gc: 
        @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/boehm-gc" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13659,8 +13661,8 @@ maybe-clean-target-qthreads:
 
 clean-target-qthreads: 
        @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/qthreads" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13680,8 +13682,8 @@ maybe-clean-target-rda:
 
 clean-target-rda: 
        @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        echo "Doing clean in $(TARGET_SUBDIR)/rda" ; \
        for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -13791,8 +13793,8 @@ distclean-target:  \
 maybe-distclean-gcc:
 distclean-gcc: 
        @[ -f ./gcc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_GCC_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13813,8 +13815,8 @@ maybe-distclean-ash:
 
 distclean-ash: 
        @[ -f ./ash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13834,8 +13836,8 @@ maybe-distclean-autoconf:
 
 distclean-autoconf: 
        @[ -f ./autoconf/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13855,8 +13857,8 @@ maybe-distclean-automake:
 
 distclean-automake: 
        @[ -f ./automake/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13876,8 +13878,8 @@ maybe-distclean-bash:
 
 distclean-bash: 
        @[ -f ./bash/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13897,8 +13899,8 @@ maybe-distclean-bfd:
 
 distclean-bfd: 
        @[ -f ./bfd/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13918,8 +13920,8 @@ maybe-distclean-opcodes:
 
 distclean-opcodes: 
        @[ -f ./opcodes/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13939,8 +13941,8 @@ maybe-distclean-binutils:
 
 distclean-binutils: 
        @[ -f ./binutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13960,8 +13962,8 @@ maybe-distclean-bison:
 
 distclean-bison: 
        @[ -f ./bison/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -13981,8 +13983,8 @@ maybe-distclean-byacc:
 
 distclean-byacc: 
        @[ -f ./byacc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14002,8 +14004,8 @@ maybe-distclean-bzip2:
 
 distclean-bzip2: 
        @[ -f ./bzip2/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14023,8 +14025,8 @@ maybe-distclean-dejagnu:
 
 distclean-dejagnu: 
        @[ -f ./dejagnu/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14044,8 +14046,8 @@ maybe-distclean-diff:
 
 distclean-diff: 
        @[ -f ./diff/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14065,8 +14067,8 @@ maybe-distclean-dosutils:
 
 distclean-dosutils: 
        @[ -f ./dosutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14086,8 +14088,8 @@ maybe-distclean-etc:
 
 distclean-etc: 
        @[ -f ./etc/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14107,8 +14109,8 @@ maybe-distclean-fastjar:
 
 distclean-fastjar: 
        @[ -f ./fastjar/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14128,8 +14130,8 @@ maybe-distclean-fileutils:
 
 distclean-fileutils: 
        @[ -f ./fileutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14149,8 +14151,8 @@ maybe-distclean-findutils:
 
 distclean-findutils: 
        @[ -f ./findutils/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14170,8 +14172,8 @@ maybe-distclean-find:
 
 distclean-find: 
        @[ -f ./find/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(SET_LIB_PATH) \
        for flag in $(EXTRA_HOST_FLAGS); do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14191,8 +14193,8 @@ maybe-distclean-flex:
 
 distclean-flex: 
        @[ -f ./flex/Makefile ] || exit 0; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMM