2004-01-26 Andrew Haley <aph@redhat.com>

[pf3gnuchains/gcc-fork.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in

index 82f67cf..e9fa3d7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,14 +61,10 @@ man7dir = $(mandir)/man7
  man8dir = $(mandir)/man8
  man9dir = $(mandir)/man9
  
-# INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a
-# cygwin host.
-INSTALL_PROGRAM_ARGS =
-
-INSTALL = $(SHELL) $$s/install-sh -c
-INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_ARGS)
-INSTALL_SCRIPT = $(INSTALL)
-INSTALL_DATA = $(INSTALL) -m 644
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_DATA = @INSTALL_DATA@
  
  # -------------------------------------------------
  # Miscellaneous non-standard autoconf-set variables
@@ -89,7 +85,7 @@ tooldir = @tooldir@
  build_tooldir = @build_tooldir@
  
  # Directory in which the compiler finds executables, libraries, etc.
-libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version)
+libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)
  GDB_NLM_DEPS = 
  
  # This is the name of the environment variable used for the path to
@@ -139,18 +135,19 @@ 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.
  CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS_FOR_BUILD = $(CFLAGS)
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  
  CXX_FOR_BUILD = $(CXX)
  
  # Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
  # here so that they can be overridden by Makefile fragments.
-BUILD_CC = $(CC_FOR_BUILD)
  BUILD_PREFIX = @BUILD_PREFIX@
  BUILD_PREFIX_1 = @BUILD_PREFIX_1@
  
@@ -387,47 +384,10 @@ all: all.normal
  ###
  
  # Flags to pass down to all sub-makes.
-# Please keep these in alphabetical order.
  BASE_FLAGS_TO_PASS = \
-       "AR_FLAGS=$(AR_FLAGS)" \
-       "AR_FOR_TARGET=$(AR_FOR_TARGET)" \
-       "AS_FOR_TARGET=$(AS_FOR_TARGET)" \
-       "BISON=$(BISON)" \
-       "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
-       "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
-       "CFLAGS=$(CFLAGS)" \
-       "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
-       "GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
-       "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
-       "CXXFLAGS=$(CXXFLAGS)" \
-       "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
-       "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
         "DESTDIR=$(DESTDIR)" \
-       "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
-       "INSTALL=$(INSTALL)" \
-       "INSTALL_DATA=$(INSTALL_DATA)" \
-       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-       "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-       "LDFLAGS=$(LDFLAGS)" \
-       "LEX=$(LEX)" \
-       "LD_FOR_TARGET=$(LD_FOR_TARGET)" \
-       "LIBCFLAGS=$(LIBCFLAGS)" \
-       "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
-       "LIBCXXFLAGS=$(LIBCXXFLAGS)" \
-       "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
-       "M4=$(M4)" \
-       "MAKE=$(MAKE)" \
-       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
-       "NM_FOR_TARGET=$(NM_FOR_TARGET)" \
-       "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
         "RPATH_ENVVAR=$(RPATH_ENVVAR)" \
-       "SHELL=$(SHELL)" \
-       "EXPECT=$(EXPECT)" \
-       "RUNTEST=$(RUNTEST)" \
-       "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
         "TARGET_SUBDIR=$(TARGET_SUBDIR)" \
-       "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
-       "YACC=$(YACC)" \
         "bindir=$(bindir)" \
         "datadir=$(datadir)" \
         "exec_prefix=$(exec_prefix)" \
@@ -450,7 +410,44 @@ BASE_FLAGS_TO_PASS = \
         "gxx_include_dir=$(gxx_include_dir)" \
         "gcc_version=$(gcc_version)" \
         "gcc_version_trigger=$(gcc_version_trigger)" \
-       "target_alias=$(target_alias)" 
+       "target_alias=$(target_alias)" \
+       "BISON=$(BISON)" \
+       "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+       "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
+       "EXPECT=$(EXPECT)" \
+       "INSTALL=$(INSTALL)" \
+       "INSTALL_DATA=$(INSTALL_DATA)" \
+       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+       "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+       "LEX=$(LEX)" \
+       "M4=$(M4)" \
+       "MAKE=$(MAKE)" \
+       "RUNTEST=$(RUNTEST)" \
+       "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+       "SHELL=$(SHELL)" \
+       "YACC=$(YACC)" \
+       "AR_FLAGS=$(AR_FLAGS)" \
+       "CFLAGS=$(CFLAGS)" \
+       "CXXFLAGS=$(CXXFLAGS)" \
+       "LDFLAGS=$(LDFLAGS)" \
+       "LIBCFLAGS=$(LIBCFLAGS)" \
+       "LIBCXXFLAGS=$(LIBCXXFLAGS)" \
+       "AR_FOR_TARGET=$(AR_FOR_TARGET)" \
+       "AS_FOR_TARGET=$(AS_FOR_TARGET)" \
+       "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
+       "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
+       "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
+       "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
+       "GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
+       "LD_FOR_TARGET=$(LD_FOR_TARGET)" \
+       "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+       "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
+       "NM_FOR_TARGET=$(NM_FOR_TARGET)" \
+       "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
+       "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
+       "CONFIG_SHELL=$(SHELL)" \
+       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
  
  # For any flags above that may contain shell code that varies from one
  # target library to another.  When doing recursive invocations of the
@@ -515,17 +512,8 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
  # The BUILD_* variables are a special case, which are used for the gcc
  # cross-building scheme.
  EXTRA_GCC_FLAGS = \
-       'AR=$(AR)' \
-       'AS=$(AS)' \
-       'CC=$(CC)' \
-       'CXX=$(CXX)' \
-       'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
-       'BUILD_CC=$(CC_FOR_BUILD)' \
         'BUILD_PREFIX=$(BUILD_PREFIX)' \
         'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \
-       'NM=$(NM)' \
-       'RANLIB=$(RANLIB)' \
-       'WINDRES=$$(WINDRES_FOR_TARGET)' \
         "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
         "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
         "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \
@@ -534,11 +522,11 @@ EXTRA_GCC_FLAGS = \
         "`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
         "`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
         "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s/.*=$$/XFOO=/`" \
-       "`echo 'ENQUIRE=$(ENQUIRE)' | sed -e s/.*=$$/XFOO=/`" \
         "`echo 'STAGE1_CFLAGS=$(STAGE1_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
-       "`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s/.*=$$/XFOO=/`"
+       "`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
+       "`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s/.*=$$/XFOO=/`"
  
-GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
+GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
  
  .PHONY: configure-host
  configure-host: maybe-configure-gcc  \
@@ -814,8 +802,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|"`; \
@@ -837,8 +825,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|"`; \
@@ -859,8 +847,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|"`; \
@@ -881,8 +869,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|"`; \
@@ -903,8 +891,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|"`; \
@@ -925,8 +913,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|"`; \
@@ -947,8 +935,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|"`; \
@@ -969,8 +957,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|"`; \
@@ -991,8 +979,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|"`; \
@@ -1013,8 +1001,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|"`; \
@@ -1035,8 +1023,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|"`; \
@@ -1057,8 +1045,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|"`; \
@@ -1079,8 +1067,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|"`; \
@@ -1101,8 +1089,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|"`; \
@@ -1123,8 +1111,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|"`; \
@@ -1145,8 +1133,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|"`; \
@@ -1167,8 +1155,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|"`; \
@@ -1189,8 +1177,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|"`; \
@@ -1211,8 +1199,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|"`; \
@@ -1233,8 +1221,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|"`; \
@@ -1255,8 +1243,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|"`; \
@@ -1277,8 +1265,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|"`; \
@@ -1299,8 +1287,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|"`; \
@@ -1321,8 +1309,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|"`; \
@@ -1343,8 +1331,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|"`; \
@@ -1365,8 +1353,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|"`; \
@@ -1387,8 +1375,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|"`; \
@@ -1409,8 +1397,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|"`; \
@@ -1431,8 +1419,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|"`; \
@@ -1453,8 +1441,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|"`; \
@@ -1475,8 +1463,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|"`; \
@@ -1497,8 +1485,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|"`; \
@@ -1519,8 +1507,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|"`; \
@@ -1541,8 +1529,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|"`; \
@@ -1563,8 +1551,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|"`; \
@@ -1585,8 +1573,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|"`; \
@@ -1607,8 +1595,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|"`; \
@@ -1629,8 +1617,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|"`; \
@@ -1651,8 +1639,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|"`; \
@@ -1673,8 +1661,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|"`; \
@@ -1695,8 +1683,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|"`; \
@@ -1717,8 +1705,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|"`; \
@@ -1739,8 +1727,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|"`; \
@@ -1761,8 +1749,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|"`; \
@@ -1783,8 +1771,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|"`; \
@@ -1805,8 +1793,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|"`; \
@@ -1827,8 +1815,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|"`; \
@@ -1849,8 +1837,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|"`; \
@@ -1871,8 +1859,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|"`; \
@@ -1893,8 +1881,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|"`; \
@@ -1915,8 +1903,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|"`; \
@@ -1937,8 +1925,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|"`; \
@@ -1959,8 +1947,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|"`; \
@@ -1981,8 +1969,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|"`; \
@@ -2003,8 +1991,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|"`; \
@@ -2025,8 +2013,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|"`; \
@@ -2047,8 +2035,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|"`; \
@@ -2069,8 +2057,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|"`; \
@@ -2091,8 +2079,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|"`; \
@@ -2113,8 +2101,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|"`; \
@@ -2135,8 +2123,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|"`; \
@@ -2157,8 +2145,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|"`; \
@@ -2179,8 +2167,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|"`; \
@@ -2201,8 +2189,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|"`; \
@@ -2223,8 +2211,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|"`; \
@@ -2248,8 +2236,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 \
@@ -2270,8 +2258,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 \
@@ -2292,8 +2280,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 \
@@ -2314,8 +2302,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 \
@@ -2336,8 +2324,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 \
@@ -2358,8 +2346,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 \
@@ -2380,8 +2368,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 \
@@ -2402,8 +2390,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 \
@@ -2424,8 +2412,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 \
@@ -2446,8 +2434,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 \
@@ -2468,8 +2456,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 \
@@ -2490,8 +2478,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 \
@@ -2512,8 +2500,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 \
@@ -2534,8 +2522,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 \
@@ -2556,8 +2544,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 \
@@ -2578,8 +2566,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 \
@@ -2690,8 +2678,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|"`; \
@@ -2713,8 +2701,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|"`; \
@@ -2735,8 +2723,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|"`; \
@@ -2757,8 +2745,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|"`; \
@@ -2779,8 +2767,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|"`; \
@@ -2801,8 +2789,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|"`; \
@@ -2823,8 +2811,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|"`; \
@@ -2845,8 +2833,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|"`; \
@@ -2867,8 +2855,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|"`; \
@@ -2889,8 +2877,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|"`; \
@@ -2911,8 +2899,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|"`; \
@@ -2933,8 +2921,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|"`; \
@@ -2955,8 +2943,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|"`; \
@@ -2977,8 +2965,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|"`; \
@@ -2999,8 +2987,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|"`; \
@@ -3021,8 +3009,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|"`; \
@@ -3043,8 +3031,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|"`; \
@@ -3065,8 +3053,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|"`; \
@@ -3087,8 +3075,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|"`; \
@@ -3109,8 +3097,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|"`; \
@@ -3131,8 +3119,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|"`; \
@@ -3153,8 +3141,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|"`; \
@@ -3175,8 +3163,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|"`; \
@@ -3197,8 +3185,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|"`; \
@@ -3219,8 +3207,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|"`; \
@@ -3241,8 +3229,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|"`; \
@@ -3263,8 +3251,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|"`; \
@@ -3285,8 +3273,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|"`; \
@@ -3307,8 +3295,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|"`; \
@@ -3329,8 +3317,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|"`; \
@@ -3351,8 +3339,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|"`; \
@@ -3373,8 +3361,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|"`; \
@@ -3395,8 +3383,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|"`; \
@@ -3417,8 +3405,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|"`; \
@@ -3439,8 +3427,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|"`; \
@@ -3461,8 +3449,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|"`; \
@@ -3483,8 +3471,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|"`; \
@@ -3505,8 +3493,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|"`; \
@@ -3527,8 +3515,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|"`; \
@@ -3549,8 +3537,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|"`; \
@@ -3571,8 +3559,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|"`; \
@@ -3593,8 +3581,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|"`; \
@@ -3615,8 +3603,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|"`; \
@@ -3637,8 +3625,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|"`; \
@@ -3659,8 +3647,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|"`; \
@@ -3681,8 +3669,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|"`; \
@@ -3703,8 +3691,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|"`; \
@@ -3725,8 +3713,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|"`; \
@@ -3747,8 +3735,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|"`; \
@@ -3769,8 +3757,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|"`; \
@@ -3791,8 +3779,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|"`; \
@@ -3813,8 +3801,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|"`; \
@@ -3835,8 +3823,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|"`; \
@@ -3857,8 +3845,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|"`; \
@@ -3879,8 +3867,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|"`; \
@@ -3901,8 +3889,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|"`; \
@@ -3923,8 +3911,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|"`; \
@@ -3945,8 +3933,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|"`; \
@@ -3967,8 +3955,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|"`; \
@@ -3989,8 +3977,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|"`; \
@@ -4011,8 +3999,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|"`; \
@@ -4033,8 +4021,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|"`; \
@@ -4055,8 +4043,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|"`; \
@@ -4077,8 +4065,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|"`; \
@@ -4099,8 +4087,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|"`; \
@@ -4124,8 +4112,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 \
@@ -4146,8 +4134,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 \
@@ -4168,8 +4156,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 \
@@ -4190,8 +4178,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 \
@@ -4212,8 +4200,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 \
@@ -4234,8 +4222,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 \
@@ -4256,8 +4244,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 \
@@ -4278,8 +4266,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 \
@@ -4300,8 +4288,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 \
@@ -4322,8 +4310,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 \
@@ -4344,8 +4332,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 \
@@ -4366,8 +4354,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 \
@@ -4388,8 +4376,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 \
@@ -4410,8 +4398,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 \
@@ -4432,8 +4420,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 \
@@ -4454,8 +4442,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 \
@@ -4566,8 +4554,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|"`; \
@@ -4589,8 +4577,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|"`; \
@@ -4611,8 +4599,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|"`; \
@@ -4633,8 +4621,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|"`; \
@@ -4655,8 +4643,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|"`; \
@@ -4677,8 +4665,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|"`; \
@@ -4699,8 +4687,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|"`; \
@@ -4721,8 +4709,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|"`; \
@@ -4743,8 +4731,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|"`; \
@@ -4765,8 +4753,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|"`; \
@@ -4787,8 +4775,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|"`; \
@@ -4809,8 +4797,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|"`; \
@@ -4831,8 +4819,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|"`; \
@@ -4853,8 +4841,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|"`; \
@@ -4875,8 +4863,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|"`; \
@@ -4897,8 +4885,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|"`; \
@@ -4919,8 +4907,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|"`; \
@@ -4941,8 +4929,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|"`; \
@@ -4963,8 +4951,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|"`; \
@@ -4985,8 +4973,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|"`; \
@@ -5007,8 +4995,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|"`; \
@@ -5029,8 +5017,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|"`; \
@@ -5051,8 +5039,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|"`; \
@@ -5073,8 +5061,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|"`; \
@@ -5095,8 +5083,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|"`; \
@@ -5117,8 +5105,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|"`; \
@@ -5139,8 +5127,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|"`; \
@@ -5161,8 +5149,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|"`; \
@@ -5183,8 +5171,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|"`; \
@@ -5205,8 +5193,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|"`; \
@@ -5227,8 +5215,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|"`; \
@@ -5249,8 +5237,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|"`; \
@@ -5271,8 +5259,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|"`; \
@@ -5293,8 +5281,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|"`; \
@@ -5315,8 +5303,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|"`; \
@@ -5337,8 +5325,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|"`; \
@@ -5359,8 +5347,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|"`; \
@@ -5381,8 +5369,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|"`; \
@@ -5403,8 +5391,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|"`; \
@@ -5425,8 +5413,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|"`; \
@@ -5447,8 +5435,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|"`; \
@@ -5469,8 +5457,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|"`; \
@@ -5491,8 +5479,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|"`; \
@@ -5513,8 +5501,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|"`; \
@@ -5535,8 +5523,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|"`; \
@@ -5557,8 +5545,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|"`; \
@@ -5579,8 +5567,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|"`; \
@@ -5601,8 +5589,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|"`; \
@@ -5623,8 +5611,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|"`; \
@@ -5645,8 +5633,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|"`; \
@@ -5667,8 +5655,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|"`; \
@@ -5689,8 +5677,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|"`; \
@@ -5711,8 +5699,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|"`; \
@@ -5733,8 +5721,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|"`; \
@@ -5755,8 +5743,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|"`; \
@@ -5777,8 +5765,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|"`; \
@@ -5799,8 +5787,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|"`; \
@@ -5821,8 +5809,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|"`; \
@@ -5843,8 +5831,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|"`; \
@@ -5865,8 +5853,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|"`; \
@@ -5887,8 +5875,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|"`; \
@@ -5909,8 +5897,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|"`; \
@@ -5931,8 +5919,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|"`; \
@@ -5953,8 +5941,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|"`; \
@@ -5975,8 +5963,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|"`; \
@@ -6000,8 +5988,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 \
@@ -6022,8 +6010,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 \
@@ -6044,8 +6032,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 \
@@ -6066,8 +6054,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 \
@@ -6088,8 +6076,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 \
@@ -6110,8 +6098,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 \
@@ -6132,8 +6120,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 \
@@ -6154,8 +6142,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 \
@@ -6176,8 +6164,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 \
@@ -6198,8 +6186,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 \
@@ -6220,8 +6208,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 \
@@ -6242,8 +6230,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 \
@@ -6264,8 +6252,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 \
@@ -6286,8 +6274,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 \
@@ -6308,8 +6296,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 \
@@ -6330,8 +6318,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 \
@@ -6443,8 +6431,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|"`; \
@@ -6467,8 +6455,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|"`; \
@@ -6490,8 +6478,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|"`; \
@@ -6513,8 +6501,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|"`; \
@@ -6536,8 +6524,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|"`; \
@@ -6559,8 +6547,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|"`; \
@@ -6582,8 +6570,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|"`; \
@@ -6605,8 +6593,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|"`; \
@@ -6628,8 +6616,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|"`; \
@@ -6651,8 +6639,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|"`; \
@@ -6674,8 +6662,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|"`; \
@@ -6697,8 +6685,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|"`; \
@@ -6720,8 +6708,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|"`; \
@@ -6743,8 +6731,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|"`; \
@@ -6766,8 +6754,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|"`; \
@@ -6789,8 +6777,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|"`; \
@@ -6812,8 +6800,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|"`; \
@@ -6835,8 +6823,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|"`; \
@@ -6858,8 +6846,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|"`; \
@@ -6881,8 +6869,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|"`; \
@@ -6904,8 +6892,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|"`; \
@@ -6927,8 +6915,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|"`; \
@@ -6950,8 +6938,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|"`; \
@@ -6973,8 +6961,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|"`; \
@@ -6996,8 +6984,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|"`; \
@@ -7019,8 +7007,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|"`; \
@@ -7042,8 +7030,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|"`; \
@@ -7065,8 +7053,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|"`; \
@@ -7088,8 +7076,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|"`; \
@@ -7111,8 +7099,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|"`; \
@@ -7134,8 +7122,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|"`; \
@@ -7157,8 +7145,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|"`; \
@@ -7180,8 +7168,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|"`; \
@@ -7203,8 +7191,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|"`; \
@@ -7226,8 +7214,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|"`; \
@@ -7249,8 +7237,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|"`; \
@@ -7272,8 +7260,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|"`; \
@@ -7295,8 +7283,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|"`; \
@@ -7318,8 +7306,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|"`; \
@@ -7341,8 +7329,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|"`; \
@@ -7364,8 +7352,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|"`; \
@@ -7387,8 +7375,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|"`; \
@@ -7410,8 +7398,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|"`; \
@@ -7433,8 +7421,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|"`; \
@@ -7456,8 +7444,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|"`; \
@@ -7479,8 +7467,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|"`; \
@@ -7502,8 +7490,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|"`; \
@@ -7525,8 +7513,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|"`; \
@@ -7548,8 +7536,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|"`; \
@@ -7571,8 +7559,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|"`; \
@@ -7594,8 +7582,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|"`; \
@@ -7617,8 +7605,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|"`; \
@@ -7640,8 +7628,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|"`; \
@@ -7663,8 +7651,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|"`; \
@@ -7686,8 +7674,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|"`; \
@@ -7709,8 +7697,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|"`; \
@@ -7732,8 +7720,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|"`; \
@@ -7755,8 +7743,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|"`; \
@@ -7778,8 +7766,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|"`; \
@@ -7801,8 +7789,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|"`; \
@@ -7824,8 +7812,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|"`; \
@@ -7847,8 +7835,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|"`; \
@@ -7870,8 +7858,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|"`; \
@@ -7893,8 +7881,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|"`; \
@@ -7916,8 +7904,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|"`; \
@@ -7942,8 +7930,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 \
@@ -7965,8 +7953,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 \
@@ -7988,8 +7976,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 \
@@ -8011,8 +7999,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 \
@@ -8034,8 +8022,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 \
@@ -8057,8 +8045,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 \
@@ -8080,8 +8068,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 \
@@ -8103,8 +8091,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 \
@@ -8126,8 +8114,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 \
@@ -8149,8 +8137,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 \
@@ -8172,8 +8160,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 \
@@ -8195,8 +8183,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 \
@@ -8218,8 +8206,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 \
@@ -8241,8 +8229,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 \
@@ -8264,8 +8252,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 \
@@ -8287,8 +8275,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 \
@@ -8399,8 +8387,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|"`; \
@@ -8422,8 +8410,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|"`; \
@@ -8444,8 +8432,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|"`; \
@@ -8466,8 +8454,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|"`; \
@@ -8488,8 +8476,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|"`; \
@@ -8510,8 +8498,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|"`; \
@@ -8532,8 +8520,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|"`; \
@@ -8554,8 +8542,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|"`; \
@@ -8576,8 +8564,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|"`; \
@@ -8598,8 +8586,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|"`; \
@@ -8620,8 +8608,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|"`; \
@@ -8642,8 +8630,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|"`; \
@@ -8664,8 +8652,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|"`; \
@@ -8686,8 +8674,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|"`; \
@@ -8708,8 +8696,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|"`; \
@@ -8730,8 +8718,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|"`; \
@@ -8752,8 +8740,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|"`; \
@@ -8774,8 +8762,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|"`; \
@@ -8796,8 +8784,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|"`; \
@@ -8818,8 +8806,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|"`; \
@@ -8840,8 +8828,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|"`; \
@@ -8862,8 +8850,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|"`; \
@@ -8884,8 +8872,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|"`; \
@@ -8906,8 +8894,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|"`; \
@@ -8928,8 +8916,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|"`; \
@@ -8950,8 +8938,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|"`; \
@@ -8972,8 +8960,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|"`; \
@@ -8994,8 +8982,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|"`; \
@@ -9016,8 +9004,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|"`; \
@@ -9038,8 +9026,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|"`; \
@@ -9060,8 +9048,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|"`; \
@@ -9082,8 +9070,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|"`; \
@@ -9104,8 +9092,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|"`; \
@@ -9126,8 +9114,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|"`; \
@@ -9148,8 +9136,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|"`; \
@@ -9170,8 +9158,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|"`; \
@@ -9192,8 +9180,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|"`; \
@@ -9214,8 +9202,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|"`; \
@@ -9236,8 +9224,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|"`; \
@@ -9258,8 +9246,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|"`; \
@@ -9280,8 +9268,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|"`; \
@@ -9302,8 +9290,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|"`; \
@@ -9324,8 +9312,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|"`; \
@@ -9346,8 +9334,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|"`; \
@@ -9368,8 +9356,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|"`; \
@@ -9390,8 +9378,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|"`; \
@@ -9412,8 +9400,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|"`; \
@@ -9434,8 +9422,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|"`; \
@@ -9456,8 +9444,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|"`; \
@@ -9478,8 +9466,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|"`; \
@@ -9500,8 +9488,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|"`; \
@@ -9522,8 +9510,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|"`; \
@@ -9544,8 +9532,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|"`; \
@@ -9566,8 +9554,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|"`; \
@@ -9588,8 +9576,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|"`; \
@@ -9610,8 +9598,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|"`; \
@@ -9632,8 +9620,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|"`; \
@@ -9654,8 +9642,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|"`; \
@@ -9676,8 +9664,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|"`; \
@@ -9698,8 +9686,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|"`; \
@@ -9720,8 +9708,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|"`; \
@@ -9742,8 +9730,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|"`; \
@@ -9764,8 +9752,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|"`; \
@@ -9786,8 +9774,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|"`; \
@@ -9808,8 +9796,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|"`; \
@@ -9833,8 +9821,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 \
@@ -9855,8 +9843,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 \
@@ -9877,8 +9865,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 \
@@ -9899,8 +9887,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 \
@@ -9921,8 +9909,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 \
@@ -9943,8 +9931,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 \
@@ -9965,8 +9953,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 \
@@ -9987,8 +9975,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 \
@@ -10009,8 +9997,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 \
@@ -10031,8 +10019,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 \
@@ -10053,8 +10041,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 \
@@ -10075,8 +10063,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 \
@@ -10097,8 +10085,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 \
@@ -10119,8 +10107,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 \
@@ -10141,8 +10129,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 \
@@ -10163,8 +10151,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 \
@@ -10274,8 +10262,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|"`; \
@@ -10296,8 +10284,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|"`; \
@@ -10317,8 +10305,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|"`; \
@@ -10338,8 +10326,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|"`; \
@@ -10359,8 +10347,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|"`; \
@@ -10380,8 +10368,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|"`; \
@@ -10401,8 +10389,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|"`; \
@@ -10422,8 +10410,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|"`; \
@@ -10443,8 +10431,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|"`; \
@@ -10464,8 +10452,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|"`; \
@@ -10485,8 +10473,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|"`; \
@@ -10506,8 +10494,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|"`; \
@@ -10527,8 +10515,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|"`; \
@@ -10548,8 +10536,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|"`; \
@@ -10569,8 +10557,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|"`; \
@@ -10590,8 +10578,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|"`; \
@@ -10611,8 +10599,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|"`; \
@@ -10632,8 +10620,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|"`; \
@@ -10653,8 +10641,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|"`; \
@@ -10674,8 +10662,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|"`; \
@@ -10695,8 +10683,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|"`; \
@@ -10716,8 +10704,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|"`; \
@@ -10737,8 +10725,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|"`; \
@@ -10758,8 +10746,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|"`; \
@@ -10779,8 +10767,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|"`; \
@@ -10800,8 +10788,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|"`; \
@@ -10821,8 +10809,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|"`; \
@@ -10842,8 +10830,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|"`; \
@@ -10863,8 +10851,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|"`; \
@@ -10891,8 +10879,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|"`; \
@@ -10912,8 +10900,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|"`; \
@@ -10933,8 +10921,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|"`; \
@@ -10954,8 +10942,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|"`; \
@@ -10975,8 +10963,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|"`; \
@@ -10996,8 +10984,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|"`; \
@@ -11017,8 +11005,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|"`; \
@@ -11038,8 +11026,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|"`; \
@@ -11059,8 +11047,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|"`; \
@@ -11080,8 +11068,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|"`; \
@@ -11101,8 +11089,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|"`; \
@@ -11122,8 +11110,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|"`; \
@@ -11143,8 +11131,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|"`; \
@@ -11164,8 +11152,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|"`; \
@@ -11185,8 +11173,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|"`; \
@@ -11206,8 +11194,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|"`; \
@@ -11227,8 +11215,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|"`; \
@@ -11248,8 +11236,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|"`; \
@@ -11269,8 +11257,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|"`; \
@@ -11290,8 +11278,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|"`; \
@@ -11311,8 +11299,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|"`; \
@@ -11332,8 +11320,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|"`; \
@@ -11353,8 +11341,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|"`; \
@@ -11374,8 +11362,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|"`; \
@@ -11395,8 +11383,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|"`; \
@@ -11416,8 +11404,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|"`; \
@@ -11437,8 +11425,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|"`; \
@@ -11458,8 +11446,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|"`; \
@@ -11479,8 +11467,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|"`; \
@@ -11500,8 +11488,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|"`; \
@@ -11521,8 +11509,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|"`; \
@@ -11542,8 +11530,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|"`; \
@@ -11563,8 +11551,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|"`; \
@@ -11591,8 +11579,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|"`; \
@@ -11615,8 +11603,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 \
@@ -11636,8 +11624,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 \
@@ -11657,8 +11645,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 \
@@ -11678,8 +11666,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 \
@@ -11706,8 +11694,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 \
@@ -11727,8 +11715,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 \
@@ -11748,8 +11736,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 \
@@ -11769,8 +11757,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 \
@@ -11790,8 +11778,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 \
@@ -11811,8 +11799,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 \
@@ -11832,8 +11820,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 \
@@ -11853,8 +11841,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 \
@@ -11874,8 +11862,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 \
@@ -11895,8 +11883,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 \
@@ -11916,8 +11904,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 \
@@ -12027,8 +12015,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|"`; \
@@ -12049,8 +12037,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|"`; \
@@ -12070,8 +12058,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|"`; \
@@ -12091,8 +12079,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|"`; \
@@ -12112,8 +12100,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|"`; \
@@ -12133,8 +12121,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|"`; \
@@ -12154,8 +12142,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|"`; \
@@ -12175,8 +12163,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|"`; \
@@ -12196,8 +12184,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|"`; \
@@ -12217,8 +12205,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|"`; \
@@ -12238,8 +12226,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|"`; \
@@ -12259,8 +12247,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|"`; \
@@ -12280,8 +12268,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|"`; \
@@ -12301,8 +12289,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|"`; \
@@ -12322,8 +12310,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|"`; \
@@ -12343,8 +12331,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|"`; \
@@ -12364,8 +12352,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|"`; \
@@ -12385,8 +12373,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|"`; \
@@ -12406,8 +12394,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|"`; \
@@ -12427,8 +12415,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|"`; \
@@ -12448,8 +12436,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|"`; \
@@ -12469,8 +12457,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|"`; \
@@ -12490,8 +12478,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|"`; \
@@ -12511,8 +12499,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|"`; \
@@ -12532,8 +12520,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|"`; \
@@ -12553,8 +12541,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|"`; \
@@ -12574,8 +12562,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|"`; \
@@ -12595,8 +12583,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|"`; \
@@ -12616,8 +12604,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|"`; \
@@ -12637,8 +12625,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|"`; \
@@ -12658,8 +12646,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|"`; \
@@ -12679,8 +12667,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|"`; \
@@ -12700,8 +12688,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|"`; \
@@ -12721,8 +12709,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|"`; \
@@ -12742,8 +12730,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|"`; \
@@ -12763,8 +12751,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|"`; \
@@ -12784,8 +12772,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|"`; \
@@ -12805,8 +12793,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|"`; \
@@ -12826,8 +12814,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|"`; \
@@ -12847,8 +12835,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|"`; \
@@ -12868,8 +12856,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|"`; \
@@ -12889,8 +12877,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|"`; \
@@ -12910,8 +12898,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|"`; \
@@ -12931,8 +12919,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|"`; \
@@ -12952,8 +12940,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|"`; \
@@ -12973,8 +12961,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|"`; \
@@ -12994,8 +12982,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|"`; \
@@ -13015,8 +13003,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|"`; \
@@ -13036,8 +13024,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|"`; \
@@ -13057,8 +13045,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|"`; \
@@ -13078,8 +13066,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|"`; \
@@ -13099,8 +13087,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|"`; \
@@ -13120,8 +13108,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|"`; \
@@ -13141,8 +13129,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|"`; \
@@ -13162,8 +13150,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|"`; \
@@ -13183,8 +13171,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|"`; \
@@ -13204,8 +13192,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|"`; \
@@ -13225,8 +13213,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|"`; \
@@ -13246,8 +13234,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|"`; \
@@ -13267,8 +13255,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|"`; \
@@ -13288,8 +13276,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|"`; \
@@ -13309,8 +13297,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|"`; \
@@ -13330,8 +13318,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|"`; \
@@ -13358,8 +13346,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|"`; \
@@ -13382,8 +13370,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 \
@@ -13403,8 +13391,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 \
@@ -13424,8 +13412,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 \
@@ -13445,8 +13433,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 \
@@ -13473,8 +13461,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 \
@@ -13494,8 +13482,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 \
@@ -13515,8 +13503,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 \
@@ -13536,8 +13524,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 \
@@ -13557,8 +13545,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 \
@@ -13578,8 +13566,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 \
@@ -13599,8 +13587,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 \
@@ -13620,8 +13608,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 \
@@ -13641,8 +13629,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 \
@@ -13662,8 +13650,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 \
@@ -13683,8 +13671,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 \
@@ -13794,8 +13782,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|"`; \
@@ -13816,8 +13804,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|"`; \
@@ -13837,8 +13825,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|"`; \
@@ -13858,8 +13846,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|"`; \
@@ -13879,8 +13867,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|"`; \
@@ -13900,8 +13888,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|"`; \
@@ -13921,8 +13909,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|"`; \
@@ -13942,8 +13930,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|"`; \
@@ -13963,8 +13951,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|"`; \
@@ -13984,8 +13972,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|"`; \
@@ -14005,8 +13993,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|"`; \
@@ -14026,8 +14014,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|"`; \
@@ -14047,8 +14035,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|"`; \
@@ -14068,8 +14056,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|"`; \
@@ -14089,8 +14077,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|"`; \
@@ -14110,8 +14098,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|"`; \
@@ -14131,8 +14119,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|"`; \
@@ -14152,8 +14140,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|"`; \
@@ -14173,8 +14161,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|"`; \
@@ -14194,8 +14182,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_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         for flag in $(EXTRA_HOST_FLAGS); do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -14215,8 +14203,8 @@ maybe-distclean-gas:
  
  distclean-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|"`; \
@@ -14236,8 +14224,8 @@ maybe-distclean-gawk:
  
  distclean-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|"`; \
@@ -14257,8 +14245,8 @@ maybe-distclean-gettext:
  
  distclean-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|"`; \
@@ -14278,8 +14266,8 @@ maybe-distclean-gnuserv:
  
  distclean-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|"`; \
@@ -14299,8 +14287,8 @@ maybe-distclean-gprof:
  
  distclean-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|"`; \
@@ -14320,8 +14308,8 @@ maybe-distclean-gzip:
  
  distclean-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|"`; \
@@ -14341,8 +14329,8 @@ maybe-distclean-hello:
  
  distclean-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|"`; \
@@ -14362,8 +14350,8 @@ maybe-distclean-indent:
  
  distclean-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|"`; \
@@ -14383,8 +14371,8 @@ maybe-distclean-intl:
  
  distclean-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|"`; \
@@ -14404,8 +14392,8 @@ maybe-distclean-tcl:
  
  distclean-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|"`; \
@@ -14425,8 +14413,8 @@ maybe-distclean-itcl:
  
  distclean-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|"`; \
@@ -14446,8 +14434,8 @@ maybe-distclean-ld:
  
  distclean-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|"`; \
@@ -14467,8 +14455,8 @@ maybe-distclean-libgui:
  
  distclean-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|"`; \
@@ -14488,8 +14476,8 @@ maybe-distclean-libiberty:
  
  distclean-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|"`; \
@@ -14509,8 +14497,8 @@ maybe-distclean-libtool:
  
  distclean-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|"`; \
@@ -14530,8 +14518,8 @@ maybe-distclean-m4:
  
  distclean-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|"`; \
@@ -14551,8 +14539,8 @@ maybe-distclean-make:
  
  distclean-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|"`; \
@@ -14572,8 +14560,8 @@ maybe-distclean-mmalloc:
  
  distclean-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|"`; \
@@ -14593,8 +14581,8 @@ maybe-distclean-patch:
  
  distclean-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|"`; \
@@ -14614,8 +14602,8 @@ maybe-distclean-perl:
  
  distclean-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|"`; \
@@ -14635,8 +14623,8 @@ maybe-distclean-prms:
  
  distclean-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|"`; \
@@ -14656,8 +14644,8 @@ maybe-distclean-rcs:
  
  distclean-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|"`; \
@@ -14677,8 +14665,8 @@ maybe-distclean-readline:
  
  distclean-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|"`; \
@@ -14698,8 +14686,8 @@ maybe-distclean-release:
  
  distclean-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|"`; \
@@ -14719,8 +14707,8 @@ maybe-distclean-recode:
  
  distclean-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|"`; \
@@ -14740,8 +14728,8 @@ maybe-distclean-sed:
  
  distclean-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|"`; \
@@ -14761,8 +14749,8 @@ maybe-distclean-send-pr:
  
  distclean-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|"`; \
@@ -14782,8 +14770,8 @@ maybe-distclean-shellutils:
  
  distclean-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|"`; \
@@ -14803,8 +14791,8 @@ maybe-distclean-sid:
  
  distclean-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|"`; \
@@ -14824,8 +14812,8 @@ maybe-distclean-sim:
  
  distclean-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|"`; \
@@ -14845,8 +14833,8 @@ maybe-distclean-tar:
  
  distclean-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|"`; \
@@ -14866,8 +14854,8 @@ maybe-distclean-texinfo:
  
  distclean-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|"`; \
@@ -14887,8 +14875,8 @@ maybe-distclean-textutils:
  
  distclean-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|"`; \
@@ -14908,8 +14896,8 @@ maybe-distclean-time:
  
  distclean-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|"`; \
@@ -14929,8 +14917,8 @@ maybe-distclean-uudecode:
  
  distclean-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|"`; \
@@ -14950,8 +14938,8 @@ maybe-distclean-wdiff:
  
  distclean-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|"`; \
@@ -14971,8 +14959,8 @@ maybe-distclean-zip:
  
  distclean-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|"`; \
@@ -14992,8 +14980,8 @@ maybe-distclean-zlib:
  
  distclean-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|"`; \
@@ -15013,8 +15001,8 @@ maybe-distclean-gdb:
  
  distclean-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|"`; \
@@ -15034,8 +15022,8 @@ maybe-distclean-expect:
  
  distclean-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|"`; \
@@ -15055,8 +15043,8 @@ maybe-distclean-guile:
  
  distclean-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|"`; \
@@ -15076,8 +15064,8 @@ maybe-distclean-tk:
  
  distclean-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|"`; \
@@ -15097,8 +15085,8 @@ maybe-distclean-tix:
  
  distclean-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|"`; \
@@ -15125,8 +15113,8 @@ maybe-distclean-utils:
  
  distclean-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|"`; \
@@ -15149,8 +15137,8 @@ maybe-distclean-target-libstdc++-v3:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15170,8 +15158,8 @@ maybe-distclean-target-newlib:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15191,8 +15179,8 @@ maybe-distclean-target-libf2c:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/libf2c" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15212,8 +15200,8 @@ maybe-distclean-target-libobjc:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15240,8 +15228,8 @@ maybe-distclean-target-winsup:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15261,8 +15249,8 @@ maybe-distclean-target-libgloss:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15282,8 +15270,8 @@ maybe-distclean-target-libiberty:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15303,8 +15291,8 @@ maybe-distclean-target-gperf:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15324,8 +15312,8 @@ maybe-distclean-target-examples:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15345,8 +15333,8 @@ maybe-distclean-target-libffi:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15366,8 +15354,8 @@ maybe-distclean-target-libjava:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15387,8 +15375,8 @@ maybe-distclean-target-zlib:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15408,8 +15396,8 @@ maybe-distclean-target-boehm-gc:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15429,8 +15417,8 @@ maybe-distclean-target-qthreads:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15450,8 +15438,8 @@ maybe-distclean-target-rda:
  
  distclean-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 distclean in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -15561,8 +15549,8 @@ maintainer-clean-target:  \
  maybe-maintainer-clean-gcc:
  maintainer-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|"`; \
@@ -15583,8 +15571,8 @@ maybe-maintainer-clean-ash:
  
  maintainer-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|"`; \
@@ -15604,8 +15592,8 @@ maybe-maintainer-clean-autoconf:
  
  maintainer-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|"`; \
@@ -15625,8 +15613,8 @@ maybe-maintainer-clean-automake:
  
  maintainer-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|"`; \
@@ -15646,8 +15634,8 @@ maybe-maintainer-clean-bash:
  
  maintainer-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|"`; \
@@ -15667,8 +15655,8 @@ maybe-maintainer-clean-bfd:
  
  maintainer-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|"`; \
@@ -15688,8 +15676,8 @@ maybe-maintainer-clean-opcodes:
  
  maintainer-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|"`; \
@@ -15709,8 +15697,8 @@ maybe-maintainer-clean-binutils:
  
  maintainer-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|"`; \
@@ -15730,8 +15718,8 @@ maybe-maintainer-clean-bison:
  
  maintainer-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|"`; \
@@ -15751,8 +15739,8 @@ maybe-maintainer-clean-byacc:
  
  maintainer-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|"`; \
@@ -15772,8 +15760,8 @@ maybe-maintainer-clean-bzip2:
  
  maintainer-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|"`; \
@@ -15793,8 +15781,8 @@ maybe-maintainer-clean-dejagnu:
  
  maintainer-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|"`; \
@@ -15814,8 +15802,8 @@ maybe-maintainer-clean-diff:
  
  maintainer-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|"`; \
@@ -15835,8 +15823,8 @@ maybe-maintainer-clean-dosutils:
  
  maintainer-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|"`; \
@@ -15856,8 +15844,8 @@ maybe-maintainer-clean-etc:
  
  maintainer-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|"`; \
@@ -15877,8 +15865,8 @@ maybe-maintainer-clean-fastjar:
  
  maintainer-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|"`; \
@@ -15898,8 +15886,8 @@ maybe-maintainer-clean-fileutils:
  
  maintainer-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|"`; \
@@ -15919,8 +15907,8 @@ maybe-maintainer-clean-findutils:
  
  maintainer-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|"`; \
@@ -15940,8 +15928,8 @@ maybe-maintainer-clean-find:
  
  maintainer-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|"`; \
@@ -15961,8 +15949,8 @@ maybe-maintainer-clean-flex:
  
  maintainer-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|"`; \
@@ -15982,8 +15970,8 @@ maybe-maintainer-clean-gas:
  
  maintainer-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|"`; \
@@ -16003,8 +15991,8 @@ maybe-maintainer-clean-gawk:
  
  maintainer-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|"`; \
@@ -16024,8 +16012,8 @@ maybe-maintainer-clean-gettext:
  
  maintainer-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|"`; \
@@ -16045,8 +16033,8 @@ maybe-maintainer-clean-gnuserv:
  
  maintainer-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|"`; \
@@ -16066,8 +16054,8 @@ maybe-maintainer-clean-gprof:
  
  maintainer-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|"`; \
@@ -16087,8 +16075,8 @@ maybe-maintainer-clean-gzip:
  
  maintainer-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|"`; \
@@ -16108,8 +16096,8 @@ maybe-maintainer-clean-hello:
  
  maintainer-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|"`; \
@@ -16129,8 +16117,8 @@ maybe-maintainer-clean-indent:
  
  maintainer-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|"`; \
@@ -16150,8 +16138,8 @@ maybe-maintainer-clean-intl:
  
  maintainer-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|"`; \
@@ -16171,8 +16159,8 @@ maybe-maintainer-clean-tcl:
  
  maintainer-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|"`; \
@@ -16192,8 +16180,8 @@ maybe-maintainer-clean-itcl:
  
  maintainer-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|"`; \
@@ -16213,8 +16201,8 @@ maybe-maintainer-clean-ld:
  
  maintainer-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|"`; \
@@ -16234,8 +16222,8 @@ maybe-maintainer-clean-libgui:
  
  maintainer-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|"`; \
@@ -16255,8 +16243,8 @@ maybe-maintainer-clean-libiberty:
  
  maintainer-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|"`; \
@@ -16276,8 +16264,8 @@ maybe-maintainer-clean-libtool:
  
  maintainer-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|"`; \
@@ -16297,8 +16285,8 @@ maybe-maintainer-clean-m4:
  
  maintainer-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|"`; \
@@ -16318,8 +16306,8 @@ maybe-maintainer-clean-make:
  
  maintainer-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|"`; \
@@ -16339,8 +16327,8 @@ maybe-maintainer-clean-mmalloc:
  
  maintainer-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|"`; \
@@ -16360,8 +16348,8 @@ maybe-maintainer-clean-patch:
  
  maintainer-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|"`; \
@@ -16381,8 +16369,8 @@ maybe-maintainer-clean-perl:
  
  maintainer-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|"`; \
@@ -16402,8 +16390,8 @@ maybe-maintainer-clean-prms:
  
  maintainer-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|"`; \
@@ -16423,8 +16411,8 @@ maybe-maintainer-clean-rcs:
  
  maintainer-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|"`; \
@@ -16444,8 +16432,8 @@ maybe-maintainer-clean-readline:
  
  maintainer-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|"`; \
@@ -16465,8 +16453,8 @@ maybe-maintainer-clean-release:
  
  maintainer-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|"`; \
@@ -16486,8 +16474,8 @@ maybe-maintainer-clean-recode:
  
  maintainer-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|"`; \
@@ -16507,8 +16495,8 @@ maybe-maintainer-clean-sed:
  
  maintainer-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|"`; \
@@ -16528,8 +16516,8 @@ maybe-maintainer-clean-send-pr:
  
  maintainer-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|"`; \
@@ -16549,8 +16537,8 @@ maybe-maintainer-clean-shellutils:
  
  maintainer-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|"`; \
@@ -16570,8 +16558,8 @@ maybe-maintainer-clean-sid:
  
  maintainer-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|"`; \
@@ -16591,8 +16579,8 @@ maybe-maintainer-clean-sim:
  
  maintainer-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|"`; \
@@ -16612,8 +16600,8 @@ maybe-maintainer-clean-tar:
  
  maintainer-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|"`; \
@@ -16633,8 +16621,8 @@ maybe-maintainer-clean-texinfo:
  
  maintainer-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|"`; \
@@ -16654,8 +16642,8 @@ maybe-maintainer-clean-textutils:
  
  maintainer-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|"`; \
@@ -16675,8 +16663,8 @@ maybe-maintainer-clean-time:
  
  maintainer-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|"`; \
@@ -16696,8 +16684,8 @@ maybe-maintainer-clean-uudecode:
  
  maintainer-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|"`; \
@@ -16717,8 +16705,8 @@ maybe-maintainer-clean-wdiff:
  
  maintainer-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|"`; \
@@ -16738,8 +16726,8 @@ maybe-maintainer-clean-zip:
  
  maintainer-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|"`; \
@@ -16759,8 +16747,8 @@ maybe-maintainer-clean-zlib:
  
  maintainer-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|"`; \
@@ -16780,8 +16768,8 @@ maybe-maintainer-clean-gdb:
  
  maintainer-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|"`; \
@@ -16801,8 +16789,8 @@ maybe-maintainer-clean-expect:
  
  maintainer-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|"`; \
@@ -16822,8 +16810,8 @@ maybe-maintainer-clean-guile:
  
  maintainer-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|"`; \
@@ -16843,8 +16831,8 @@ maybe-maintainer-clean-tk:
  
  maintainer-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|"`; \
@@ -16864,8 +16852,8 @@ maybe-maintainer-clean-tix:
  
  maintainer-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|"`; \
@@ -16892,8 +16880,8 @@ maybe-maintainer-clean-utils:
  
  maintainer-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|"`; \
@@ -16916,8 +16904,8 @@ maybe-maintainer-clean-target-libstdc++-v3:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -16937,8 +16925,8 @@ maybe-maintainer-clean-target-newlib:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/newlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -16958,8 +16946,8 @@ maybe-maintainer-clean-target-libf2c:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/libf2c" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -16979,8 +16967,8 @@ maybe-maintainer-clean-target-libobjc:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/libobjc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -17007,8 +16995,8 @@ maybe-maintainer-clean-target-winsup:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/winsup" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -17028,8 +17016,8 @@ maybe-maintainer-clean-target-libgloss:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/libgloss" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -17049,8 +17037,8 @@ maybe-maintainer-clean-target-libiberty:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/libiberty" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -17070,8 +17058,8 @@ maybe-maintainer-clean-target-gperf:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/gperf" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -17091,8 +17079,8 @@ maybe-maintainer-clean-target-examples:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/examples" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -17112,8 +17100,8 @@ maybe-maintainer-clean-target-libffi:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/libffi" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -17133,8 +17121,8 @@ maybe-maintainer-clean-target-libjava:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/libjava" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -17154,8 +17142,8 @@ maybe-maintainer-clean-target-zlib:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/zlib" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -17175,8 +17163,8 @@ maybe-maintainer-clean-target-boehm-gc:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/boehm-gc" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -17196,8 +17184,8 @@ maybe-maintainer-clean-target-qthreads:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/qthreads" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -17217,8 +17205,8 @@ maybe-maintainer-clean-target-rda:
  
  maintainer-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 maintainer-clean in $(TARGET_SUBDIR)/rda" ; \
         for flag in $(EXTRA_TARGET_FLAGS); do \
@@ -17249,7 +17237,7 @@ dvi: do-dvi
  do-info: maybe-all-texinfo
  
  install-info: do-install-info dir.info
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         if [ -f dir.info ] ; then \
           $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
         else true ; fi
@@ -17292,8 +17280,7 @@ clean-target-libgcc:
  # Check target.
  
  .PHONY: check do-check
-check:
-       $(MAKE) do-check
+check: do-check
  
  # Only include modules actually being configured and built.
  do-check: maybe-check-gcc  \
@@ -17563,7 +17550,7 @@ uninstall:
  .PHONY: install.all
  install.all: install-no-fixedincludes
         @if [ -f ./gcc/Makefile ] ; then \
-               r=`${PWD}` ; export r ; \
+               r=`${PWD_COMMAND}` ; export r ; \
                 $(SET_LIB_PATH) \
                 (cd ./gcc && \
                 $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
@@ -17615,14 +17602,14 @@ TAGS: do-TAGS
  maybe-configure-build-libiberty:
  configure-build-libiberty:
         @test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
-       [ -d $(BUILD_SUBDIR)/libiberty ] || \
-         mkdir $(BUILD_SUBDIR)/libiberty;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         AR="$(AR_FOR_BUILD)"; export AR; \
         AS="$(AS_FOR_BUILD)"; export AS; \
         CC="$(CC_FOR_BUILD)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX_FOR_BUILD)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
         GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
@@ -17676,8 +17663,8 @@ configure-build-libiberty:
  .PHONY: all-build-libiberty maybe-all-build-libiberty
  maybe-all-build-libiberty:
  all-build-libiberty: configure-build-libiberty
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         (cd $(BUILD_SUBDIR)/libiberty && $(MAKE) all)
  
  
@@ -17690,10 +17677,11 @@ maybe-configure-ash:
  configure-ash:
         @test ! -f ash/Makefile || exit 0; \
         [ -d ash ] || mkdir ash; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -17726,8 +17714,8 @@ configure-ash:
  .PHONY: all-ash maybe-all-ash
  maybe-all-ash:
  all-ash: configure-ash
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd ash && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -17735,8 +17723,8 @@ all-ash: configure-ash
  maybe-check-ash:
  
  check-ash:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd ash && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -17745,8 +17733,8 @@ check-ash:
  maybe-install-ash:
  
  install-ash: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd ash && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -17756,10 +17744,11 @@ maybe-configure-autoconf:
  configure-autoconf:
         @test ! -f autoconf/Makefile || exit 0; \
         [ -d autoconf ] || mkdir autoconf; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -17792,8 +17781,8 @@ configure-autoconf:
  .PHONY: all-autoconf maybe-all-autoconf
  maybe-all-autoconf:
  all-autoconf: configure-autoconf
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -17801,8 +17790,8 @@ all-autoconf: configure-autoconf
  maybe-check-autoconf:
  
  check-autoconf:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -17811,8 +17800,8 @@ check-autoconf:
  maybe-install-autoconf:
  
  install-autoconf: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -17822,10 +17811,11 @@ maybe-configure-automake:
  configure-automake:
         @test ! -f automake/Makefile || exit 0; \
         [ -d automake ] || mkdir automake; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -17858,8 +17848,8 @@ configure-automake:
  .PHONY: all-automake maybe-all-automake
  maybe-all-automake:
  all-automake: configure-automake
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd automake && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -17867,8 +17857,8 @@ all-automake: configure-automake
  maybe-check-automake:
  
  check-automake:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd automake && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -17877,8 +17867,8 @@ check-automake:
  maybe-install-automake:
  
  install-automake: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd automake && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -17888,10 +17878,11 @@ maybe-configure-bash:
  configure-bash:
         @test ! -f bash/Makefile || exit 0; \
         [ -d bash ] || mkdir bash; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -17924,8 +17915,8 @@ configure-bash:
  .PHONY: all-bash maybe-all-bash
  maybe-all-bash:
  all-bash: configure-bash
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd bash && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -17933,8 +17924,8 @@ all-bash: configure-bash
  maybe-check-bash:
  
  check-bash:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd bash && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -17943,8 +17934,8 @@ check-bash:
  maybe-install-bash:
  
  install-bash: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd bash && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -17954,10 +17945,11 @@ maybe-configure-bfd:
  configure-bfd:
         @test ! -f bfd/Makefile || exit 0; \
         [ -d bfd ] || mkdir bfd; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -17990,8 +17982,8 @@ configure-bfd:
  .PHONY: all-bfd maybe-all-bfd
  maybe-all-bfd:
  all-bfd: configure-bfd
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd bfd && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -17999,8 +17991,8 @@ all-bfd: configure-bfd
  maybe-check-bfd:
  
  check-bfd:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd bfd && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -18009,8 +18001,8 @@ check-bfd:
  maybe-install-bfd:
  
  install-bfd: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd bfd && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18020,10 +18012,11 @@ maybe-configure-opcodes:
  configure-opcodes:
         @test ! -f opcodes/Makefile || exit 0; \
         [ -d opcodes ] || mkdir opcodes; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18056,8 +18049,8 @@ configure-opcodes:
  .PHONY: all-opcodes maybe-all-opcodes
  maybe-all-opcodes:
  all-opcodes: configure-opcodes
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18065,8 +18058,8 @@ all-opcodes: configure-opcodes
  maybe-check-opcodes:
  
  check-opcodes:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -18075,8 +18068,8 @@ check-opcodes:
  maybe-install-opcodes:
  
  install-opcodes: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18086,10 +18079,11 @@ maybe-configure-binutils:
  configure-binutils:
         @test ! -f binutils/Makefile || exit 0; \
         [ -d binutils ] || mkdir binutils; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18122,8 +18116,8 @@ configure-binutils:
  .PHONY: all-binutils maybe-all-binutils
  maybe-all-binutils:
  all-binutils: configure-binutils
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd binutils && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18131,8 +18125,8 @@ all-binutils: configure-binutils
  maybe-check-binutils:
  
  check-binutils:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd binutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -18141,8 +18135,8 @@ check-binutils:
  maybe-install-binutils:
  
  install-binutils: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd binutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18152,10 +18146,11 @@ maybe-configure-bison:
  configure-bison:
         @test ! -f bison/Makefile || exit 0; \
         [ -d bison ] || mkdir bison; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18188,8 +18183,8 @@ configure-bison:
  .PHONY: all-bison maybe-all-bison
  maybe-all-bison:
  all-bison: configure-bison
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd bison && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18199,8 +18194,8 @@ maybe-check-bison:
  # This module is only tested in a native toolchain.
  check-bison:
         @if [ '$(host)' = '$(target)' ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd bison && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
@@ -18210,8 +18205,8 @@ check-bison:
  maybe-install-bison:
  
  install-bison: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd bison && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18221,10 +18216,11 @@ maybe-configure-byacc:
  configure-byacc:
         @test ! -f byacc/Makefile || exit 0; \
         [ -d byacc ] || mkdir byacc; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18257,8 +18253,8 @@ configure-byacc:
  .PHONY: all-byacc maybe-all-byacc
  maybe-all-byacc:
  all-byacc: configure-byacc
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd byacc && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18268,8 +18264,8 @@ maybe-check-byacc:
  # This module is only tested in a native toolchain.
  check-byacc:
         @if [ '$(host)' = '$(target)' ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd byacc && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
@@ -18279,8 +18275,8 @@ check-byacc:
  maybe-install-byacc:
  
  install-byacc: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd byacc && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18290,10 +18286,11 @@ maybe-configure-bzip2:
  configure-bzip2:
         @test ! -f bzip2/Makefile || exit 0; \
         [ -d bzip2 ] || mkdir bzip2; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18326,8 +18323,8 @@ configure-bzip2:
  .PHONY: all-bzip2 maybe-all-bzip2
  maybe-all-bzip2:
  all-bzip2: configure-bzip2
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18335,8 +18332,8 @@ all-bzip2: configure-bzip2
  maybe-check-bzip2:
  
  check-bzip2:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -18345,8 +18342,8 @@ check-bzip2:
  maybe-install-bzip2:
  
  install-bzip2: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18356,10 +18353,11 @@ maybe-configure-dejagnu:
  configure-dejagnu:
         @test ! -f dejagnu/Makefile || exit 0; \
         [ -d dejagnu ] || mkdir dejagnu; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18392,8 +18390,8 @@ configure-dejagnu:
  .PHONY: all-dejagnu maybe-all-dejagnu
  maybe-all-dejagnu:
  all-dejagnu: configure-dejagnu
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18401,8 +18399,8 @@ all-dejagnu: configure-dejagnu
  maybe-check-dejagnu:
  
  check-dejagnu:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -18411,8 +18409,8 @@ check-dejagnu:
  maybe-install-dejagnu:
  
  install-dejagnu: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18422,10 +18420,11 @@ maybe-configure-diff:
  configure-diff:
         @test ! -f diff/Makefile || exit 0; \
         [ -d diff ] || mkdir diff; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18458,8 +18457,8 @@ configure-diff:
  .PHONY: all-diff maybe-all-diff
  maybe-all-diff:
  all-diff: configure-diff
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd diff && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18467,8 +18466,8 @@ all-diff: configure-diff
  maybe-check-diff:
  
  check-diff:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd diff && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -18477,8 +18476,8 @@ check-diff:
  maybe-install-diff:
  
  install-diff: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd diff && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18488,10 +18487,11 @@ maybe-configure-dosutils:
  configure-dosutils:
         @test ! -f dosutils/Makefile || exit 0; \
         [ -d dosutils ] || mkdir dosutils; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18524,8 +18524,8 @@ configure-dosutils:
  .PHONY: all-dosutils maybe-all-dosutils
  maybe-all-dosutils:
  all-dosutils: configure-dosutils
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18539,8 +18539,8 @@ check-dosutils:
  maybe-install-dosutils:
  
  install-dosutils: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18550,10 +18550,11 @@ maybe-configure-etc:
  configure-etc:
         @test ! -f etc/Makefile || exit 0; \
         [ -d etc ] || mkdir etc; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18586,8 +18587,8 @@ configure-etc:
  .PHONY: all-etc maybe-all-etc
  maybe-all-etc:
  all-etc: configure-etc
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd etc && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18595,8 +18596,8 @@ all-etc: configure-etc
  maybe-check-etc:
  
  check-etc:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd etc && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -18605,8 +18606,8 @@ check-etc:
  maybe-install-etc:
  
  install-etc: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd etc && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18616,10 +18617,11 @@ maybe-configure-fastjar:
  configure-fastjar:
         @test ! -f fastjar/Makefile || exit 0; \
         [ -d fastjar ] || mkdir fastjar; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18652,8 +18654,8 @@ configure-fastjar:
  .PHONY: all-fastjar maybe-all-fastjar
  maybe-all-fastjar:
  all-fastjar: configure-fastjar
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18663,8 +18665,8 @@ maybe-check-fastjar:
  # This module is only tested in a native toolchain.
  check-fastjar:
         @if [ '$(host)' = '$(target)' ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
@@ -18674,8 +18676,8 @@ check-fastjar:
  maybe-install-fastjar:
  
  install-fastjar: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18685,10 +18687,11 @@ maybe-configure-fileutils:
  configure-fileutils:
         @test ! -f fileutils/Makefile || exit 0; \
         [ -d fileutils ] || mkdir fileutils; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18721,8 +18724,8 @@ configure-fileutils:
  .PHONY: all-fileutils maybe-all-fileutils
  maybe-all-fileutils:
  all-fileutils: configure-fileutils
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18730,8 +18733,8 @@ all-fileutils: configure-fileutils
  maybe-check-fileutils:
  
  check-fileutils:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -18740,8 +18743,8 @@ check-fileutils:
  maybe-install-fileutils:
  
  install-fileutils: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18751,10 +18754,11 @@ maybe-configure-findutils:
  configure-findutils:
         @test ! -f findutils/Makefile || exit 0; \
         [ -d findutils ] || mkdir findutils; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18787,8 +18791,8 @@ configure-findutils:
  .PHONY: all-findutils maybe-all-findutils
  maybe-all-findutils:
  all-findutils: configure-findutils
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd findutils && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18796,8 +18800,8 @@ all-findutils: configure-findutils
  maybe-check-findutils:
  
  check-findutils:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd findutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -18806,8 +18810,8 @@ check-findutils:
  maybe-install-findutils:
  
  install-findutils: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd findutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18817,10 +18821,11 @@ maybe-configure-find:
  configure-find:
         @test ! -f find/Makefile || exit 0; \
         [ -d find ] || mkdir find; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18853,8 +18858,8 @@ configure-find:
  .PHONY: all-find maybe-all-find
  maybe-all-find:
  all-find: configure-find
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd find && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18862,8 +18867,8 @@ all-find: configure-find
  maybe-check-find:
  
  check-find:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd find && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -18872,8 +18877,8 @@ check-find:
  maybe-install-find:
  
  install-find: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd find && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18883,10 +18888,11 @@ maybe-configure-flex:
  configure-flex:
         @test ! -f flex/Makefile || exit 0; \
         [ -d flex ] || mkdir flex; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18919,8 +18925,8 @@ configure-flex:
  .PHONY: all-flex maybe-all-flex
  maybe-all-flex:
  all-flex: configure-flex
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd flex && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18930,8 +18936,8 @@ maybe-check-flex:
  # This module is only tested in a native toolchain.
  check-flex:
         @if [ '$(host)' = '$(target)' ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd flex && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
@@ -18941,8 +18947,8 @@ check-flex:
  maybe-install-flex:
  
  install-flex: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd flex && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -18952,10 +18958,11 @@ maybe-configure-gas:
  configure-gas:
         @test ! -f gas/Makefile || exit 0; \
         [ -d gas ] || mkdir gas; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -18988,8 +18995,8 @@ configure-gas:
  .PHONY: all-gas maybe-all-gas
  maybe-all-gas:
  all-gas: configure-gas
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gas && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -18997,8 +19004,8 @@ all-gas: configure-gas
  maybe-check-gas:
  
  check-gas:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gas && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19007,8 +19014,8 @@ check-gas:
  maybe-install-gas:
  
  install-gas: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gas && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19018,10 +19025,11 @@ maybe-configure-gawk:
  configure-gawk:
         @test ! -f gawk/Makefile || exit 0; \
         [ -d gawk ] || mkdir gawk; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19054,8 +19062,8 @@ configure-gawk:
  .PHONY: all-gawk maybe-all-gawk
  maybe-all-gawk:
  all-gawk: configure-gawk
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gawk && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19063,8 +19071,8 @@ all-gawk: configure-gawk
  maybe-check-gawk:
  
  check-gawk:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gawk && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19073,8 +19081,8 @@ check-gawk:
  maybe-install-gawk:
  
  install-gawk: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gawk && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19084,10 +19092,11 @@ maybe-configure-gettext:
  configure-gettext:
         @test ! -f gettext/Makefile || exit 0; \
         [ -d gettext ] || mkdir gettext; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19120,8 +19129,8 @@ configure-gettext:
  .PHONY: all-gettext maybe-all-gettext
  maybe-all-gettext:
  all-gettext: configure-gettext
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gettext && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19129,8 +19138,8 @@ all-gettext: configure-gettext
  maybe-check-gettext:
  
  check-gettext:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gettext && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19139,8 +19148,8 @@ check-gettext:
  maybe-install-gettext:
  
  install-gettext: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gettext && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19150,10 +19159,11 @@ maybe-configure-gnuserv:
  configure-gnuserv:
         @test ! -f gnuserv/Makefile || exit 0; \
         [ -d gnuserv ] || mkdir gnuserv; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19186,8 +19196,8 @@ configure-gnuserv:
  .PHONY: all-gnuserv maybe-all-gnuserv
  maybe-all-gnuserv:
  all-gnuserv: configure-gnuserv
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19195,8 +19205,8 @@ all-gnuserv: configure-gnuserv
  maybe-check-gnuserv:
  
  check-gnuserv:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19205,8 +19215,8 @@ check-gnuserv:
  maybe-install-gnuserv:
  
  install-gnuserv: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19216,10 +19226,11 @@ maybe-configure-gprof:
  configure-gprof:
         @test ! -f gprof/Makefile || exit 0; \
         [ -d gprof ] || mkdir gprof; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19252,8 +19263,8 @@ configure-gprof:
  .PHONY: all-gprof maybe-all-gprof
  maybe-all-gprof:
  all-gprof: configure-gprof
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gprof && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19261,8 +19272,8 @@ all-gprof: configure-gprof
  maybe-check-gprof:
  
  check-gprof:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gprof && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19271,8 +19282,8 @@ check-gprof:
  maybe-install-gprof:
  
  install-gprof: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19282,10 +19293,11 @@ maybe-configure-gzip:
  configure-gzip:
         @test ! -f gzip/Makefile || exit 0; \
         [ -d gzip ] || mkdir gzip; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19318,8 +19330,8 @@ configure-gzip:
  .PHONY: all-gzip maybe-all-gzip
  maybe-all-gzip:
  all-gzip: configure-gzip
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gzip && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19327,8 +19339,8 @@ all-gzip: configure-gzip
  maybe-check-gzip:
  
  check-gzip:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gzip && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19337,8 +19349,8 @@ check-gzip:
  maybe-install-gzip:
  
  install-gzip: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gzip && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19348,10 +19360,11 @@ maybe-configure-hello:
  configure-hello:
         @test ! -f hello/Makefile || exit 0; \
         [ -d hello ] || mkdir hello; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19384,8 +19397,8 @@ configure-hello:
  .PHONY: all-hello maybe-all-hello
  maybe-all-hello:
  all-hello: configure-hello
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd hello && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19393,8 +19406,8 @@ all-hello: configure-hello
  maybe-check-hello:
  
  check-hello:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd hello && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19403,8 +19416,8 @@ check-hello:
  maybe-install-hello:
  
  install-hello: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd hello && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19414,10 +19427,11 @@ maybe-configure-indent:
  configure-indent:
         @test ! -f indent/Makefile || exit 0; \
         [ -d indent ] || mkdir indent; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19450,8 +19464,8 @@ configure-indent:
  .PHONY: all-indent maybe-all-indent
  maybe-all-indent:
  all-indent: configure-indent
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd indent && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19459,8 +19473,8 @@ all-indent: configure-indent
  maybe-check-indent:
  
  check-indent:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd indent && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19469,8 +19483,8 @@ check-indent:
  maybe-install-indent:
  
  install-indent: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd indent && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19480,10 +19494,11 @@ maybe-configure-intl:
  configure-intl:
         @test ! -f intl/Makefile || exit 0; \
         [ -d intl ] || mkdir intl; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19516,8 +19531,8 @@ configure-intl:
  .PHONY: all-intl maybe-all-intl
  maybe-all-intl:
  all-intl: configure-intl
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd intl && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19525,8 +19540,8 @@ all-intl: configure-intl
  maybe-check-intl:
  
  check-intl:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd intl && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19535,8 +19550,8 @@ check-intl:
  maybe-install-intl:
  
  install-intl: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd intl && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19546,10 +19561,11 @@ maybe-configure-tcl:
  configure-tcl:
         @test ! -f tcl/Makefile || exit 0; \
         [ -d tcl ] || mkdir tcl; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19582,8 +19598,8 @@ configure-tcl:
  .PHONY: all-tcl maybe-all-tcl
  maybe-all-tcl:
  all-tcl: configure-tcl
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd tcl && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19591,8 +19607,8 @@ all-tcl: configure-tcl
  maybe-check-tcl:
  
  check-tcl:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd tcl && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19601,8 +19617,8 @@ check-tcl:
  maybe-install-tcl:
  
  install-tcl: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd tcl && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19612,10 +19628,11 @@ maybe-configure-itcl:
  configure-itcl:
         @test ! -f itcl/Makefile || exit 0; \
         [ -d itcl ] || mkdir itcl; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19648,8 +19665,8 @@ configure-itcl:
  .PHONY: all-itcl maybe-all-itcl
  maybe-all-itcl:
  all-itcl: configure-itcl
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd itcl && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19657,8 +19674,8 @@ all-itcl: configure-itcl
  maybe-check-itcl:
  
  check-itcl:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd itcl && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19667,8 +19684,8 @@ check-itcl:
  maybe-install-itcl:
  
  install-itcl: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd itcl && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19678,10 +19695,11 @@ maybe-configure-ld:
  configure-ld:
         @test ! -f ld/Makefile || exit 0; \
         [ -d ld ] || mkdir ld; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19714,8 +19732,8 @@ configure-ld:
  .PHONY: all-ld maybe-all-ld
  maybe-all-ld:
  all-ld: configure-ld
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd ld && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19723,8 +19741,8 @@ all-ld: configure-ld
  maybe-check-ld:
  
  check-ld:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd ld && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19733,8 +19751,8 @@ check-ld:
  maybe-install-ld:
  
  install-ld: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd ld && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19744,10 +19762,11 @@ maybe-configure-libgui:
  configure-libgui:
         @test ! -f libgui/Makefile || exit 0; \
         [ -d libgui ] || mkdir libgui; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19780,8 +19799,8 @@ configure-libgui:
  .PHONY: all-libgui maybe-all-libgui
  maybe-all-libgui:
  all-libgui: configure-libgui
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd libgui && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19789,8 +19808,8 @@ all-libgui: configure-libgui
  maybe-check-libgui:
  
  check-libgui:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd libgui && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19799,8 +19818,8 @@ check-libgui:
  maybe-install-libgui:
  
  install-libgui: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd libgui && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19810,10 +19829,11 @@ maybe-configure-libiberty:
  configure-libiberty:
         @test ! -f libiberty/Makefile || exit 0; \
         [ -d libiberty ] || mkdir libiberty; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19846,8 +19866,8 @@ configure-libiberty:
  .PHONY: all-libiberty maybe-all-libiberty
  maybe-all-libiberty:
  all-libiberty: configure-libiberty
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19855,8 +19875,8 @@ all-libiberty: configure-libiberty
  maybe-check-libiberty:
  
  check-libiberty:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19865,8 +19885,8 @@ check-libiberty:
  maybe-install-libiberty:
  
  install-libiberty: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19876,10 +19896,11 @@ maybe-configure-libtool:
  configure-libtool:
         @test ! -f libtool/Makefile || exit 0; \
         [ -d libtool ] || mkdir libtool; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19912,8 +19933,8 @@ configure-libtool:
  .PHONY: all-libtool maybe-all-libtool
  maybe-all-libtool:
  all-libtool: configure-libtool
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd libtool && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19921,8 +19942,8 @@ all-libtool: configure-libtool
  maybe-check-libtool:
  
  check-libtool:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd libtool && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19931,8 +19952,8 @@ check-libtool:
  maybe-install-libtool:
  
  install-libtool: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd libtool && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -19942,10 +19963,11 @@ maybe-configure-m4:
  configure-m4:
         @test ! -f m4/Makefile || exit 0; \
         [ -d m4 ] || mkdir m4; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -19978,8 +20000,8 @@ configure-m4:
  .PHONY: all-m4 maybe-all-m4
  maybe-all-m4:
  all-m4: configure-m4
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd m4 && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -19987,8 +20009,8 @@ all-m4: configure-m4
  maybe-check-m4:
  
  check-m4:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd m4 && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -19997,8 +20019,8 @@ check-m4:
  maybe-install-m4:
  
  install-m4: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd m4 && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20008,10 +20030,11 @@ maybe-configure-make:
  configure-make:
         @test ! -f make/Makefile || exit 0; \
         [ -d make ] || mkdir make; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20044,8 +20067,8 @@ configure-make:
  .PHONY: all-make maybe-all-make
  maybe-all-make:
  all-make: configure-make
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd make && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20053,8 +20076,8 @@ all-make: configure-make
  maybe-check-make:
  
  check-make:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd make && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -20063,8 +20086,8 @@ check-make:
  maybe-install-make:
  
  install-make: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd make && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20074,10 +20097,11 @@ maybe-configure-mmalloc:
  configure-mmalloc:
         @test ! -f mmalloc/Makefile || exit 0; \
         [ -d mmalloc ] || mkdir mmalloc; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20110,8 +20134,8 @@ configure-mmalloc:
  .PHONY: all-mmalloc maybe-all-mmalloc
  maybe-all-mmalloc:
  all-mmalloc: configure-mmalloc
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20125,8 +20149,8 @@ check-mmalloc:
  maybe-install-mmalloc:
  
  install-mmalloc: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20136,10 +20160,11 @@ maybe-configure-patch:
  configure-patch:
         @test ! -f patch/Makefile || exit 0; \
         [ -d patch ] || mkdir patch; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20172,8 +20197,8 @@ configure-patch:
  .PHONY: all-patch maybe-all-patch
  maybe-all-patch:
  all-patch: configure-patch
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd patch && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20181,8 +20206,8 @@ all-patch: configure-patch
  maybe-check-patch:
  
  check-patch:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd patch && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -20191,8 +20216,8 @@ check-patch:
  maybe-install-patch:
  
  install-patch: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd patch && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20202,10 +20227,11 @@ maybe-configure-perl:
  configure-perl:
         @test ! -f perl/Makefile || exit 0; \
         [ -d perl ] || mkdir perl; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20238,8 +20264,8 @@ configure-perl:
  .PHONY: all-perl maybe-all-perl
  maybe-all-perl:
  all-perl: configure-perl
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd perl && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20247,8 +20273,8 @@ all-perl: configure-perl
  maybe-check-perl:
  
  check-perl:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd perl && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -20257,8 +20283,8 @@ check-perl:
  maybe-install-perl:
  
  install-perl: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd perl && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20268,10 +20294,11 @@ maybe-configure-prms:
  configure-prms:
         @test ! -f prms/Makefile || exit 0; \
         [ -d prms ] || mkdir prms; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20304,8 +20331,8 @@ configure-prms:
  .PHONY: all-prms maybe-all-prms
  maybe-all-prms:
  all-prms: configure-prms
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd prms && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20313,8 +20340,8 @@ all-prms: configure-prms
  maybe-check-prms:
  
  check-prms:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd prms && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -20323,8 +20350,8 @@ check-prms:
  maybe-install-prms:
  
  install-prms: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd prms && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20334,10 +20361,11 @@ maybe-configure-rcs:
  configure-rcs:
         @test ! -f rcs/Makefile || exit 0; \
         [ -d rcs ] || mkdir rcs; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20370,8 +20398,8 @@ configure-rcs:
  .PHONY: all-rcs maybe-all-rcs
  maybe-all-rcs:
  all-rcs: configure-rcs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd rcs && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20379,8 +20407,8 @@ all-rcs: configure-rcs
  maybe-check-rcs:
  
  check-rcs:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd rcs && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -20389,8 +20417,8 @@ check-rcs:
  maybe-install-rcs:
  
  install-rcs: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd rcs && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20400,10 +20428,11 @@ maybe-configure-readline:
  configure-readline:
         @test ! -f readline/Makefile || exit 0; \
         [ -d readline ] || mkdir readline; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20436,8 +20465,8 @@ configure-readline:
  .PHONY: all-readline maybe-all-readline
  maybe-all-readline:
  all-readline: configure-readline
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd readline && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20445,8 +20474,8 @@ all-readline: configure-readline
  maybe-check-readline:
  
  check-readline:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd readline && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -20455,8 +20484,8 @@ check-readline:
  maybe-install-readline:
  
  install-readline: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd readline && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20466,10 +20495,11 @@ maybe-configure-release:
  configure-release:
         @test ! -f release/Makefile || exit 0; \
         [ -d release ] || mkdir release; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20502,8 +20532,8 @@ configure-release:
  .PHONY: all-release maybe-all-release
  maybe-all-release:
  all-release: configure-release
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd release && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20524,10 +20554,11 @@ maybe-configure-recode:
  configure-recode:
         @test ! -f recode/Makefile || exit 0; \
         [ -d recode ] || mkdir recode; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20560,8 +20591,8 @@ configure-recode:
  .PHONY: all-recode maybe-all-recode
  maybe-all-recode:
  all-recode: configure-recode
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd recode && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20569,8 +20600,8 @@ all-recode: configure-recode
  maybe-check-recode:
  
  check-recode:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd recode && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -20579,8 +20610,8 @@ check-recode:
  maybe-install-recode:
  
  install-recode: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd recode && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20590,10 +20621,11 @@ maybe-configure-sed:
  configure-sed:
         @test ! -f sed/Makefile || exit 0; \
         [ -d sed ] || mkdir sed; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20626,8 +20658,8 @@ configure-sed:
  .PHONY: all-sed maybe-all-sed
  maybe-all-sed:
  all-sed: configure-sed
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd sed && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20635,8 +20667,8 @@ all-sed: configure-sed
  maybe-check-sed:
  
  check-sed:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd sed && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -20645,8 +20677,8 @@ check-sed:
  maybe-install-sed:
  
  install-sed: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd sed && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20656,10 +20688,11 @@ maybe-configure-send-pr:
  configure-send-pr:
         @test ! -f send-pr/Makefile || exit 0; \
         [ -d send-pr ] || mkdir send-pr; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20692,8 +20725,8 @@ configure-send-pr:
  .PHONY: all-send-pr maybe-all-send-pr
  maybe-all-send-pr:
  all-send-pr: configure-send-pr
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20701,8 +20734,8 @@ all-send-pr: configure-send-pr
  maybe-check-send-pr:
  
  check-send-pr:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -20711,8 +20744,8 @@ check-send-pr:
  maybe-install-send-pr:
  
  install-send-pr: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20722,10 +20755,11 @@ maybe-configure-shellutils:
  configure-shellutils:
         @test ! -f shellutils/Makefile || exit 0; \
         [ -d shellutils ] || mkdir shellutils; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20758,8 +20792,8 @@ configure-shellutils:
  .PHONY: all-shellutils maybe-all-shellutils
  maybe-all-shellutils:
  all-shellutils: configure-shellutils
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20767,8 +20801,8 @@ all-shellutils: configure-shellutils
  maybe-check-shellutils:
  
  check-shellutils:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -20777,8 +20811,8 @@ check-shellutils:
  maybe-install-shellutils:
  
  install-shellutils: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20788,10 +20822,11 @@ maybe-configure-sid:
  configure-sid:
         @test ! -f sid/Makefile || exit 0; \
         [ -d sid ] || mkdir sid; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20824,8 +20859,8 @@ configure-sid:
  .PHONY: all-sid maybe-all-sid
  maybe-all-sid:
  all-sid: configure-sid
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd sid && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20833,8 +20868,8 @@ all-sid: configure-sid
  maybe-check-sid:
  
  check-sid:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd sid && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -20843,8 +20878,8 @@ check-sid:
  maybe-install-sid:
  
  install-sid: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd sid && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20854,10 +20889,11 @@ maybe-configure-sim:
  configure-sim:
         @test ! -f sim/Makefile || exit 0; \
         [ -d sim ] || mkdir sim; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20890,8 +20926,8 @@ configure-sim:
  .PHONY: all-sim maybe-all-sim
  maybe-all-sim:
  all-sim: configure-sim
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd sim && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20899,8 +20935,8 @@ all-sim: configure-sim
  maybe-check-sim:
  
  check-sim:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd sim && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -20909,8 +20945,8 @@ check-sim:
  maybe-install-sim:
  
  install-sim: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd sim && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20920,10 +20956,11 @@ maybe-configure-tar:
  configure-tar:
         @test ! -f tar/Makefile || exit 0; \
         [ -d tar ] || mkdir tar; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -20956,8 +20993,8 @@ configure-tar:
  .PHONY: all-tar maybe-all-tar
  maybe-all-tar:
  all-tar: configure-tar
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd tar && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -20965,8 +21002,8 @@ all-tar: configure-tar
  maybe-check-tar:
  
  check-tar:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd tar && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -20975,8 +21012,8 @@ check-tar:
  maybe-install-tar:
  
  install-tar: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd tar && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -20986,10 +21023,11 @@ maybe-configure-texinfo:
  configure-texinfo:
         @test ! -f texinfo/Makefile || exit 0; \
         [ -d texinfo ] || mkdir texinfo; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21022,8 +21060,8 @@ configure-texinfo:
  .PHONY: all-texinfo maybe-all-texinfo
  maybe-all-texinfo:
  all-texinfo: configure-texinfo
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -21031,8 +21069,8 @@ all-texinfo: configure-texinfo
  maybe-check-texinfo:
  
  check-texinfo:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -21048,10 +21086,11 @@ maybe-configure-textutils:
  configure-textutils:
         @test ! -f textutils/Makefile || exit 0; \
         [ -d textutils ] || mkdir textutils; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21084,8 +21123,8 @@ configure-textutils:
  .PHONY: all-textutils maybe-all-textutils
  maybe-all-textutils:
  all-textutils: configure-textutils
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd textutils && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -21093,8 +21132,8 @@ all-textutils: configure-textutils
  maybe-check-textutils:
  
  check-textutils:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd textutils && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -21103,8 +21142,8 @@ check-textutils:
  maybe-install-textutils:
  
  install-textutils: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd textutils && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -21114,10 +21153,11 @@ maybe-configure-time:
  configure-time:
         @test ! -f time/Makefile || exit 0; \
         [ -d time ] || mkdir time; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21150,8 +21190,8 @@ configure-time:
  .PHONY: all-time maybe-all-time
  maybe-all-time:
  all-time: configure-time
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd time && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -21159,8 +21199,8 @@ all-time: configure-time
  maybe-check-time:
  
  check-time:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd time && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -21169,8 +21209,8 @@ check-time:
  maybe-install-time:
  
  install-time: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd time && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -21180,10 +21220,11 @@ maybe-configure-uudecode:
  configure-uudecode:
         @test ! -f uudecode/Makefile || exit 0; \
         [ -d uudecode ] || mkdir uudecode; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21216,8 +21257,8 @@ configure-uudecode:
  .PHONY: all-uudecode maybe-all-uudecode
  maybe-all-uudecode:
  all-uudecode: configure-uudecode
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -21225,8 +21266,8 @@ all-uudecode: configure-uudecode
  maybe-check-uudecode:
  
  check-uudecode:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -21235,8 +21276,8 @@ check-uudecode:
  maybe-install-uudecode:
  
  install-uudecode: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -21246,10 +21287,11 @@ maybe-configure-wdiff:
  configure-wdiff:
         @test ! -f wdiff/Makefile || exit 0; \
         [ -d wdiff ] || mkdir wdiff; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21282,8 +21324,8 @@ configure-wdiff:
  .PHONY: all-wdiff maybe-all-wdiff
  maybe-all-wdiff:
  all-wdiff: configure-wdiff
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -21291,8 +21333,8 @@ all-wdiff: configure-wdiff
  maybe-check-wdiff:
  
  check-wdiff:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) check)
  
@@ -21301,8 +21343,8 @@ check-wdiff:
  maybe-install-wdiff:
  
  install-wdiff: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -21312,10 +21354,11 @@ maybe-configure-zip:
  configure-zip:
         @test ! -f zip/Makefile || exit 0; \
         [ -d zip ] || mkdir zip; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21348,8 +21391,8 @@ configure-zip:
  .PHONY: all-zip maybe-all-zip
  maybe-all-zip:
  all-zip: configure-zip
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd zip && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -21359,8 +21402,8 @@ maybe-check-zip:
  # This module is only tested in a native toolchain.
  check-zip:
         @if [ '$(host)' = '$(target)' ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd zip && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
@@ -21370,8 +21413,8 @@ check-zip:
  maybe-install-zip:
  
  install-zip: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd zip && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -21381,10 +21424,11 @@ maybe-configure-zlib:
  configure-zlib:
         @test ! -f zlib/Makefile || exit 0; \
         [ -d zlib ] || mkdir zlib; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21417,8 +21461,8 @@ configure-zlib:
  .PHONY: all-zlib maybe-all-zlib
  maybe-all-zlib:
  all-zlib: configure-zlib
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd zlib && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -21439,10 +21483,11 @@ maybe-configure-gdb:
  configure-gdb:
         @test ! -f gdb/Makefile || exit 0; \
         [ -d gdb ] || mkdir gdb; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21475,8 +21520,8 @@ configure-gdb:
  .PHONY: all-gdb maybe-all-gdb
  maybe-all-gdb:
  all-gdb: configure-gdb
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
  
@@ -21484,8 +21529,8 @@ all-gdb: configure-gdb
  maybe-check-gdb:
  
  check-gdb:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
@@ -21494,8 +21539,8 @@ check-gdb:
  maybe-install-gdb:
  
  install-gdb: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
@@ -21505,10 +21550,11 @@ maybe-configure-expect:
  configure-expect:
         @test ! -f expect/Makefile || exit 0; \
         [ -d expect ] || mkdir expect; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21541,8 +21587,8 @@ configure-expect:
  .PHONY: all-expect maybe-all-expect
  maybe-all-expect:
  all-expect: configure-expect
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
  
@@ -21550,8 +21596,8 @@ all-expect: configure-expect
  maybe-check-expect:
  
  check-expect:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
@@ -21560,8 +21606,8 @@ check-expect:
  maybe-install-expect:
  
  install-expect: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
@@ -21571,10 +21617,11 @@ maybe-configure-guile:
  configure-guile:
         @test ! -f guile/Makefile || exit 0; \
         [ -d guile ] || mkdir guile; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21607,8 +21654,8 @@ configure-guile:
  .PHONY: all-guile maybe-all-guile
  maybe-all-guile:
  all-guile: configure-guile
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
  
@@ -21616,8 +21663,8 @@ all-guile: configure-guile
  maybe-check-guile:
  
  check-guile:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
@@ -21626,8 +21673,8 @@ check-guile:
  maybe-install-guile:
  
  install-guile: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
@@ -21637,10 +21684,11 @@ maybe-configure-tk:
  configure-tk:
         @test ! -f tk/Makefile || exit 0; \
         [ -d tk ] || mkdir tk; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21673,8 +21721,8 @@ configure-tk:
  .PHONY: all-tk maybe-all-tk
  maybe-all-tk:
  all-tk: configure-tk
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
  
@@ -21682,8 +21730,8 @@ all-tk: configure-tk
  maybe-check-tk:
  
  check-tk:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
@@ -21692,8 +21740,8 @@ check-tk:
  maybe-install-tk:
  
  install-tk: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
@@ -21703,10 +21751,11 @@ maybe-configure-tix:
  configure-tix:
         @test ! -f tix/Makefile || exit 0; \
         [ -d tix ] || mkdir tix; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21739,8 +21788,8 @@ configure-tix:
  .PHONY: all-tix maybe-all-tix
  maybe-all-tix:
  all-tix: configure-tix
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
  
@@ -21748,8 +21797,8 @@ all-tix: configure-tix
  maybe-check-tix:
  
  check-tix:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
  
@@ -21758,8 +21807,8 @@ check-tix:
  maybe-install-tix:
  
  install-tix: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
  
@@ -21769,10 +21818,11 @@ maybe-configure-libtermcap:
  configure-libtermcap:
         @test ! -f libtermcap/Makefile || exit 0; \
         [ -d libtermcap ] || mkdir libtermcap; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21805,8 +21855,8 @@ configure-libtermcap:
  .PHONY: all-libtermcap maybe-all-libtermcap
  maybe-all-libtermcap:
  all-libtermcap: configure-libtermcap
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -21820,8 +21870,8 @@ check-libtermcap:
  maybe-install-libtermcap:
  
  install-libtermcap: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -21831,10 +21881,11 @@ maybe-configure-utils:
  configure-utils:
         @test ! -f utils/Makefile || exit 0; \
         [ -d utils ] || mkdir utils; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         AR="$(AR)"; export AR; \
@@ -21867,8 +21918,8 @@ configure-utils:
  .PHONY: all-utils maybe-all-utils
  maybe-all-utils:
  all-utils: configure-utils
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd utils && $(MAKE) $(FLAGS_TO_PASS) all)
  
@@ -21882,8 +21933,8 @@ check-utils:
  maybe-install-utils:
  
  install-utils: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd utils && $(MAKE) $(FLAGS_TO_PASS) install)
  
@@ -21898,22 +21949,21 @@ maybe-configure-target-libstdc++-v3:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libstdc++-v3/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libstdc++-v3 ] || \
-         mkdir $(TARGET_SUBDIR)/libstdc++-v3; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
         rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
  
  configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
         @test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/libstdc++-v3 ] || \
-         mkdir $(TARGET_SUBDIR)/libstdc++-v3;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
         CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \
@@ -21936,30 +21986,8 @@ configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/libstdc++-v3 "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
           libsrcdir="$$s/libstdc++-v3"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -21969,8 +21997,8 @@ configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
  .PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
  maybe-all-target-libstdc++-v3:
  all-target-libstdc++-v3: configure-target-libstdc++-v3
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
@@ -21979,8 +22007,8 @@ all-target-libstdc++-v3: configure-target-libstdc++-v3
  maybe-check-target-libstdc++-v3:
  
  check-target-libstdc++-v3:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
@@ -21990,8 +22018,8 @@ check-target-libstdc++-v3:
  maybe-install-target-libstdc++-v3:
  
  install-target-libstdc++-v3: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -22002,22 +22030,21 @@ maybe-configure-target-newlib:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/newlib/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/newlib ] || \
-         mkdir $(TARGET_SUBDIR)/newlib; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
         rm -f $(TARGET_SUBDIR)/newlib/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/newlib/multilib.out
  
  configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
         @test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/newlib ] || \
-         mkdir $(TARGET_SUBDIR)/newlib;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -22039,30 +22066,8 @@ configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/newlib "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/newlib"; \
           libsrcdir="$$s/newlib"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -22072,8 +22077,8 @@ configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
  .PHONY: all-target-newlib maybe-all-target-newlib
  maybe-all-target-newlib:
  all-target-newlib: configure-target-newlib
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -22082,8 +22087,8 @@ all-target-newlib: configure-target-newlib
  maybe-check-target-newlib:
  
  check-target-newlib:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
@@ -22093,8 +22098,8 @@ check-target-newlib:
  maybe-install-target-newlib:
  
  install-target-newlib: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/newlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -22105,22 +22110,21 @@ maybe-configure-target-libf2c:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libf2c/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libf2c ] || \
-         mkdir $(TARGET_SUBDIR)/libf2c; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libf2c ; \
         rm -f $(TARGET_SUBDIR)/libf2c/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libf2c/multilib.out
  
  configure-target-libf2c: $(TARGET_SUBDIR)/libf2c/multilib.out
         @test ! -f $(TARGET_SUBDIR)/libf2c/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/libf2c ] || \
-         mkdir $(TARGET_SUBDIR)/libf2c;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libf2c ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -22142,30 +22146,8 @@ configure-target-libf2c: $(TARGET_SUBDIR)/libf2c/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/libf2c "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/libf2c"; \
           libsrcdir="$$s/libf2c"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -22175,8 +22157,8 @@ configure-target-libf2c: $(TARGET_SUBDIR)/libf2c/multilib.out
  .PHONY: all-target-libf2c maybe-all-target-libf2c
  maybe-all-target-libf2c:
  all-target-libf2c: configure-target-libf2c
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libf2c && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -22185,8 +22167,8 @@ all-target-libf2c: configure-target-libf2c
  maybe-check-target-libf2c:
  
  check-target-libf2c:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libf2c && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
@@ -22196,8 +22178,8 @@ check-target-libf2c:
  maybe-install-target-libf2c:
  
  install-target-libf2c: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libf2c && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -22208,22 +22190,21 @@ maybe-configure-target-libobjc:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libobjc/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libobjc ] || \
-         mkdir $(TARGET_SUBDIR)/libobjc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
         rm -f $(TARGET_SUBDIR)/libobjc/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libobjc/multilib.out
  
  configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
         @test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/libobjc ] || \
-         mkdir $(TARGET_SUBDIR)/libobjc;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -22245,30 +22226,8 @@ configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/libobjc "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/libobjc"; \
           libsrcdir="$$s/libobjc"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -22278,8 +22237,8 @@ configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
  .PHONY: all-target-libobjc maybe-all-target-libobjc
  maybe-all-target-libobjc:
  all-target-libobjc: configure-target-libobjc
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -22288,8 +22247,8 @@ all-target-libobjc: configure-target-libobjc
  maybe-check-target-libobjc:
  
  check-target-libobjc:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
@@ -22299,8 +22258,8 @@ check-target-libobjc:
  maybe-install-target-libobjc:
  
  install-target-libobjc: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libobjc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -22311,22 +22270,21 @@ maybe-configure-target-libtermcap:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libtermcap/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libtermcap ] || \
-         mkdir $(TARGET_SUBDIR)/libtermcap; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
         rm -f $(TARGET_SUBDIR)/libtermcap/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libtermcap/multilib.out
  
  configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
         @test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/libtermcap ] || \
-         mkdir $(TARGET_SUBDIR)/libtermcap;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -22381,8 +22339,8 @@ configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
  .PHONY: all-target-libtermcap maybe-all-target-libtermcap
  maybe-all-target-libtermcap:
  all-target-libtermcap: configure-target-libtermcap
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -22398,8 +22356,8 @@ check-target-libtermcap:
  maybe-install-target-libtermcap:
  
  install-target-libtermcap: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libtermcap && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -22410,22 +22368,21 @@ maybe-configure-target-winsup:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/winsup/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/winsup ] || \
-         mkdir $(TARGET_SUBDIR)/winsup; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
         rm -f $(TARGET_SUBDIR)/winsup/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/winsup/multilib.out
  
  configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
         @test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/winsup ] || \
-         mkdir $(TARGET_SUBDIR)/winsup;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -22447,30 +22404,8 @@ configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/winsup "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/winsup"; \
           libsrcdir="$$s/winsup"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -22480,8 +22415,8 @@ configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
  .PHONY: all-target-winsup maybe-all-target-winsup
  maybe-all-target-winsup:
  all-target-winsup: configure-target-winsup
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -22490,8 +22425,8 @@ all-target-winsup: configure-target-winsup
  maybe-check-target-winsup:
  
  check-target-winsup:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
@@ -22501,8 +22436,8 @@ check-target-winsup:
  maybe-install-target-winsup:
  
  install-target-winsup: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/winsup && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -22513,22 +22448,21 @@ maybe-configure-target-libgloss:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libgloss/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libgloss ] || \
-         mkdir $(TARGET_SUBDIR)/libgloss; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
         rm -f $(TARGET_SUBDIR)/libgloss/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libgloss/multilib.out
  
  configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
         @test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/libgloss ] || \
-         mkdir $(TARGET_SUBDIR)/libgloss;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -22550,30 +22484,8 @@ configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/libgloss "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/libgloss"; \
           libsrcdir="$$s/libgloss"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -22583,8 +22495,8 @@ configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
  .PHONY: all-target-libgloss maybe-all-target-libgloss
  maybe-all-target-libgloss:
  all-target-libgloss: configure-target-libgloss
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -22600,8 +22512,8 @@ check-target-libgloss:
  maybe-install-target-libgloss:
  
  install-target-libgloss: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libgloss && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -22612,22 +22524,21 @@ maybe-configure-target-libiberty:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libiberty/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libiberty ] || \
-         mkdir $(TARGET_SUBDIR)/libiberty; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
         rm -f $(TARGET_SUBDIR)/libiberty/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libiberty/multilib.out
  
  configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
         @test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/libiberty ] || \
-         mkdir $(TARGET_SUBDIR)/libiberty;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -22649,30 +22560,8 @@ configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/libiberty "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/libiberty"; \
           libsrcdir="$$s/libiberty"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -22682,8 +22571,8 @@ configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
  .PHONY: all-target-libiberty maybe-all-target-libiberty
  maybe-all-target-libiberty:
  all-target-libiberty: configure-target-libiberty
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libiberty && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -22692,8 +22581,8 @@ all-target-libiberty: configure-target-libiberty
  maybe-check-target-libiberty:
  
  check-target-libiberty:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libiberty && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
@@ -22703,8 +22592,8 @@ check-target-libiberty:
  maybe-install-target-libiberty:
  
  install-target-libiberty: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libiberty && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -22715,22 +22604,21 @@ maybe-configure-target-gperf:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/gperf/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/gperf ] || \
-         mkdir $(TARGET_SUBDIR)/gperf; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
         rm -f $(TARGET_SUBDIR)/gperf/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/gperf/multilib.out
  
  configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
         @test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/gperf ] || \
-         mkdir $(TARGET_SUBDIR)/gperf;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -22752,30 +22640,8 @@ configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/gperf "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/gperf"; \
           libsrcdir="$$s/gperf"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -22785,8 +22651,8 @@ configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
  .PHONY: all-target-gperf maybe-all-target-gperf
  maybe-all-target-gperf:
  all-target-gperf: configure-target-gperf
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/gperf && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -22795,8 +22661,8 @@ all-target-gperf: configure-target-gperf
  maybe-check-target-gperf:
  
  check-target-gperf:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/gperf && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
@@ -22806,8 +22672,8 @@ check-target-gperf:
  maybe-install-target-gperf:
  
  install-target-gperf: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/gperf && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -22818,22 +22684,21 @@ maybe-configure-target-examples:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/examples/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/examples ] || \
-         mkdir $(TARGET_SUBDIR)/examples; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
         rm -f $(TARGET_SUBDIR)/examples/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/examples/multilib.out
  
  configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
         @test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/examples ] || \
-         mkdir $(TARGET_SUBDIR)/examples;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -22855,30 +22720,8 @@ configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/examples "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/examples"; \
           libsrcdir="$$s/examples"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -22888,8 +22731,8 @@ configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
  .PHONY: all-target-examples maybe-all-target-examples
  maybe-all-target-examples:
  all-target-examples: configure-target-examples
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/examples && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -22913,22 +22756,21 @@ maybe-configure-target-libffi:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libffi/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libffi ] || \
-         mkdir $(TARGET_SUBDIR)/libffi; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
         rm -f $(TARGET_SUBDIR)/libffi/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libffi/multilib.out
  
  configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
         @test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/libffi ] || \
-         mkdir $(TARGET_SUBDIR)/libffi;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -22950,30 +22792,8 @@ configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/libffi "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/libffi"; \
           libsrcdir="$$s/libffi"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -22983,8 +22803,8 @@ configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
  .PHONY: all-target-libffi maybe-all-target-libffi
  maybe-all-target-libffi:
  all-target-libffi: configure-target-libffi
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -22993,8 +22813,8 @@ all-target-libffi: configure-target-libffi
  maybe-check-target-libffi:
  
  check-target-libffi:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
@@ -23004,8 +22824,8 @@ check-target-libffi:
  maybe-install-target-libffi:
  
  install-target-libffi: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libffi && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -23016,22 +22836,21 @@ maybe-configure-target-libjava:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/libjava/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/libjava ] || \
-         mkdir $(TARGET_SUBDIR)/libjava; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
         rm -f $(TARGET_SUBDIR)/libjava/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/libjava/multilib.out
  
  configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
         @test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/libjava ] || \
-         mkdir $(TARGET_SUBDIR)/libjava;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
         CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \
@@ -23054,30 +22873,8 @@ configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/libjava "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/libjava"; \
           libsrcdir="$$s/libjava"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -23087,8 +22884,8 @@ configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
  .PHONY: all-target-libjava maybe-all-target-libjava
  maybe-all-target-libjava:
  all-target-libjava: configure-target-libjava
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libjava && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  all)
@@ -23097,8 +22894,8 @@ all-target-libjava: configure-target-libjava
  maybe-check-target-libjava:
  
  check-target-libjava:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libjava && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  check)
@@ -23108,8 +22905,8 @@ check-target-libjava:
  maybe-install-target-libjava:
  
  install-target-libjava: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/libjava && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -23120,22 +22917,21 @@ maybe-configure-target-zlib:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/zlib/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/zlib ] || \
-         mkdir $(TARGET_SUBDIR)/zlib; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
         rm -f $(TARGET_SUBDIR)/zlib/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/zlib/multilib.out
  
  configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
         @test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/zlib ] || \
-         mkdir $(TARGET_SUBDIR)/zlib;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -23190,8 +22986,8 @@ configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
  .PHONY: all-target-zlib maybe-all-target-zlib
  maybe-all-target-zlib:
  all-target-zlib: configure-target-zlib
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -23200,8 +22996,8 @@ all-target-zlib: configure-target-zlib
  maybe-check-target-zlib:
  
  check-target-zlib:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
@@ -23211,8 +23007,8 @@ check-target-zlib:
  maybe-install-target-zlib:
  
  install-target-zlib: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/zlib && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -23223,22 +23019,21 @@ maybe-configure-target-boehm-gc:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/boehm-gc/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/boehm-gc ] || \
-         mkdir $(TARGET_SUBDIR)/boehm-gc; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
         rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/boehm-gc/multilib.out
  
  configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
         @test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/boehm-gc ] || \
-         mkdir $(TARGET_SUBDIR)/boehm-gc;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -23260,30 +23055,8 @@ configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/boehm-gc "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/boehm-gc"; \
           libsrcdir="$$s/boehm-gc"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -23293,8 +23066,8 @@ configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
  .PHONY: all-target-boehm-gc maybe-all-target-boehm-gc
  maybe-all-target-boehm-gc:
  all-target-boehm-gc: configure-target-boehm-gc
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/boehm-gc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -23303,8 +23076,8 @@ all-target-boehm-gc: configure-target-boehm-gc
  maybe-check-target-boehm-gc:
  
  check-target-boehm-gc:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/boehm-gc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
@@ -23314,8 +23087,8 @@ check-target-boehm-gc:
  maybe-install-target-boehm-gc:
  
  install-target-boehm-gc: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/boehm-gc && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -23326,22 +23099,21 @@ maybe-configure-target-qthreads:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/qthreads/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/qthreads ] || \
-         mkdir $(TARGET_SUBDIR)/qthreads; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
         rm -f $(TARGET_SUBDIR)/qthreads/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/qthreads/multilib.out
  
  configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
         @test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/qthreads ] || \
-         mkdir $(TARGET_SUBDIR)/qthreads;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -23363,30 +23135,8 @@ configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/qthreads "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/qthreads"; \
           libsrcdir="$$s/qthreads"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -23396,8 +23146,8 @@ configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
  .PHONY: all-target-qthreads maybe-all-target-qthreads
  maybe-all-target-qthreads:
  all-target-qthreads: configure-target-qthreads
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/qthreads && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -23406,8 +23156,8 @@ all-target-qthreads: configure-target-qthreads
  maybe-check-target-qthreads:
  
  check-target-qthreads:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/qthreads && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
@@ -23417,8 +23167,8 @@ check-target-qthreads:
  maybe-install-target-qthreads:
  
  install-target-qthreads: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/qthreads && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -23429,22 +23179,21 @@ maybe-configure-target-rda:
  
  # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
  $(TARGET_SUBDIR)/rda/multilib.out: multilib.out
-       @[ -d $(TARGET_SUBDIR)/rda ] || \
-         mkdir $(TARGET_SUBDIR)/rda; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
         rm -f $(TARGET_SUBDIR)/rda/Makefile || : ; \
         cp multilib.out $(TARGET_SUBDIR)/rda/multilib.out
  
  configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
         @test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
-       [ -d $(TARGET_SUBDIR)/rda ] || \
-         mkdir $(TARGET_SUBDIR)/rda;\
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         AR="$(AR_FOR_TARGET)"; export AR; \
         AS="$(AS_FOR_TARGET)"; export AS; \
         CC="$(CC_FOR_TARGET)"; export CC; \
         CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXX="$(CXX_FOR_TARGET)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
@@ -23466,30 +23215,8 @@ configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
               *) topdir="../../$(srcdir)" ;; \
             esac ;; \
         esac; \
-       if [ "$(srcdir)" = "." ] ; then \
-         if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-           if $(SHELL) $$s/symlink-tree $${topdir}/rda "no-such-file" ; then \
-             if [ -f Makefile ]; then \
-               if $(MAKE) distclean; then \
-                 true; \
-               else \
-                 exit 1; \
-               fi; \
-             else \
-               true; \
-             fi; \
-           else \
-             exit 1; \
-           fi; \
-         else \
-           true; \
-         fi; \
-         srcdiroption="--srcdir=."; \
-         libsrcdir="."; \
-       else \
           srcdiroption="--srcdir=$${topdir}/rda"; \
           libsrcdir="$$s/rda"; \
-       fi; \
         rm -f no-such-file || : ; \
         CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
           $(TARGET_CONFIGARGS) $${srcdiroption} \
@@ -23499,8 +23226,8 @@ configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
  .PHONY: all-target-rda maybe-all-target-rda
  maybe-all-target-rda:
  all-target-rda: configure-target-rda
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/rda && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
@@ -23509,8 +23236,8 @@ all-target-rda: configure-target-rda
  maybe-check-target-rda:
  
  check-target-rda:
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/rda && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
@@ -23520,8 +23247,8 @@ check-target-rda:
  maybe-install-target-rda:
  
  install-target-rda: installdirs
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(SET_LIB_PATH) \
         (cd $(TARGET_SUBDIR)/rda && \
           $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
@@ -23537,15 +23264,19 @@ install-target-rda: installdirs
  # build modules.  So GCC is a sort of hybrid.
  
  # gcc is the only module which uses GCC_FLAGS_TO_PASS.
+# Don't use shared host config.cache, as it will confuse later
+# directories; GCC wants slightly different values for some
+# precious variables.  *sigh*
  .PHONY: configure-gcc maybe-configure-gcc
  maybe-configure-gcc:
  configure-gcc:
         @test ! -f gcc/Makefile || exit 0; \
         [ -d gcc ] || mkdir gcc; \
-       r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         CC="$(CC)"; export CC; \
         CFLAGS="$(CFLAGS)"; export CFLAGS; \
+       CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
         TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
@@ -23583,13 +23314,13 @@ configure-gcc:
  maybe-all-gcc:
  all-gcc: configure-gcc
         @if [ -f gcc/stage_last ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
         else \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
         fi
@@ -23607,13 +23338,13 @@ all-gcc: configure-gcc
  GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
  .PHONY: $(GCC_STRAP_TARGETS)
  $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
-       @r=`${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 "Bootstrapping the compiler"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
-       @r=`${PWD}`; export r; \
-       s=`cd $(srcdir); ${PWD}`; export s; \
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         case "$@" in \
           *bootstrap4-lean ) \
             msg="Comparing stage3 and stage4 of the compiler"; \
@@ -23631,38 +23362,38 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
         $(SET_LIB_PATH) \
         echo "$$msg"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
-       @r=`${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 "Building runtime libraries"; \
         $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
  
  profiledbootstrap: all-bootstrap configure-gcc
-       @r=`${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 "Bootstrapping the compiler"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
-       @r=`${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 "Building runtime libraries and training compiler"; \
         $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
-       @r=`${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 "Building feedback based compiler"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
  
  .PHONY: cross
  cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
-       @r=`${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 "Building the C and C++ compiler"; \
         cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
-       @r=`${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 "Building runtime libraries"; \
         $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \
@@ -23672,8 +23403,8 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
  maybe-check-gcc:
  check-gcc:
         @if [ -f ./gcc/Makefile ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
         else \
@@ -23683,8 +23414,8 @@ check-gcc:
  .PHONY: check-gcc-c++
  check-gcc-c++:
         @if [ -f ./gcc/Makefile ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
         else \
@@ -23692,15 +23423,14 @@ check-gcc-c++:
         fi
  
  .PHONY: check-c++
-check-c++:
-       $(MAKE) check-target-libstdc++-v3 check-gcc-c++
+check-c++: check-target-libstdc++-v3 check-gcc-c++
  
  .PHONY: install-gcc maybe-install-gcc
  maybe-install-gcc:
  install-gcc:
         @if [ -f ./gcc/Makefile ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
         else \
@@ -23719,8 +23449,8 @@ gcc-no-fixedincludes:
           cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
           touch gcc/stmp-fixinc gcc/include/fixed; \
           rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}` ; export s; \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
           $(SET_LIB_PATH) \
           (cd ./gcc && \
            $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
@@ -23741,16 +23471,17 @@ gcc-no-fixedincludes:
  
  # Host modules specific to gcc.
  # GCC needs to identify certain tools.
-configure-gcc: maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
-all-gcc: maybe-all-libiberty maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib
+# GCC also needs the information exported by the intl configure script.
+configure-gcc: maybe-configure-intl maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
+all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib
  # This is a slightly kludgy method of getting dependencies on 
  # all-build-libiberty correct; it would be better to build it every time.
  all-gcc: maybe-all-build-libiberty
-all-bootstrap: maybe-all-libiberty maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib
+all-bootstrap: maybe-all-libiberty maybe-all-intl maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib
  
  # Host modules specific to gdb.
  # GDB needs to know that the simulator is being built.
-configure-gdb: maybe-configure-tcl maybe-configure-tk maybe-configure-sim
+configure-gdb: maybe-configure-itcl maybe-configure-tcl maybe-configure-tk maybe-configure-sim
  GDB_TK = @GDB_TK@
  all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
  install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui
@@ -23801,7 +23532,7 @@ all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc
  all-gzip: maybe-all-libiberty
  all-hello: maybe-all-libiberty
  all-m4: maybe-all-libiberty maybe-all-texinfo
-all-make: maybe-all-libiberty
+all-make: maybe-all-libiberty maybe-all-intl
  all-patch: maybe-all-libiberty
  all-prms: maybe-all-libiberty
  all-recode: maybe-all-libiberty
@@ -23864,7 +23595,7 @@ configure-target-qthreads: $(ALL_GCC_C)
  # We use move-if-change so that it's only considered updated when it
  # actually changes, because it has to depend on a phony target.
  multilib.out: maybe-all-gcc
-       @r=`${PWD}`; export r; \
+       @r=`${PWD_COMMAND}`; export r; \
         echo "Checking multilib configuration..."; \
         $(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
         $(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \
@@ -23879,7 +23610,7 @@ Makefile: $(srcdir)/Makefile.in config.status
         CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
  config.status: configure $(gcc_version_trigger)
-       $(SHELL) ./config.status --recheck
+       CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck
  
  # Rebuilding configure.
  AUTOCONF = autoconf