Daily bump.

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

index 2538a9f..91c19d9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,20 +26,11 @@
  VPATH=@srcdir@
  
  build_alias=@build_alias@
-build_cpu=@build_cpu@
-build_vendor=@build_vendor@
-build_os=@build_os@
-build_canonical=@build_cpu@-@build_vendor@-@build_os@
+build=@build@
  host_alias=@host_alias@
-host_cpu=@host_cpu@
-host_vendor=@host_vendor@
-host_os=@host_os@
-host_canonical=@host_cpu@-@host_vendor@-@host_os@
+host=@host@
  target_alias=@target_alias@
-target_cpu=@target_cpu@
-target_vendor=@target_vendor@
-target_os=@target_os@
-target_canonical=@target_cpu@-@target_vendor@-@target_os@
+target=@target@
  
  program_transform_name = @program_transform_name@
  
@@ -70,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
@@ -98,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
@@ -148,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@
  
@@ -263,7 +251,7 @@ USUAL_AR_FOR_TARGET = ` \
    if [ -f $$r/binutils/ar ] ; then \
      echo $$r/binutils/ar ; \
    else \
-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+    if [ '$(host)' = '$(target)' ] ; then \
        echo $(AR); \
      else \
         echo ar | sed '$(program_transform_name)' ; \
@@ -277,7 +265,7 @@ USUAL_AS_FOR_TARGET = ` \
    elif [ -f $$r/gcc/xgcc ]; then \
      $(CC_FOR_TARGET) -print-prog-name=as ; \
    else \
-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+    if [ '$(host)' = '$(target)' ] ; then \
        echo $(AS); \
      else \
         echo as | sed '$(program_transform_name)' ; \
@@ -310,7 +298,7 @@ USUAL_DLLTOOL_FOR_TARGET = ` \
    if [ -f $$r/binutils/dlltool ] ; then \
      echo $$r/binutils/dlltool ; \
    else \
-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+    if [ '$(host)' = '$(target)' ] ; then \
        echo $(DLLTOOL); \
      else \
         echo dlltool | sed '$(program_transform_name)' ; \
@@ -326,7 +314,7 @@ USUAL_LD_FOR_TARGET = ` \
    elif [ -f $$r/gcc/xgcc ]; then \
      $(CC_FOR_TARGET) -print-prog-name=ld ; \
    else \
-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+    if [ '$(host)' = '$(target)' ] ; then \
        echo $(LD); \
      else \
         echo ld | sed '$(program_transform_name)' ; \
@@ -342,7 +330,7 @@ USUAL_NM_FOR_TARGET = ` \
    elif [ -f $$r/gcc/xgcc ]; then \
      $(CC_FOR_TARGET) -print-prog-name=nm ; \
    else \
-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+    if [ '$(host)' = '$(target)' ] ; then \
        echo $(NM); \
      else \
         echo nm | sed '$(program_transform_name)' ; \
@@ -354,7 +342,7 @@ USUAL_RANLIB_FOR_TARGET = ` \
    if [ -f $$r/binutils/ranlib ] ; then \
      echo $$r/binutils/ranlib ; \
    else \
-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+    if [ '$(host)' = '$(target)' ] ; then \
        if [ x'$(RANLIB)' != x ]; then \
           echo $(RANLIB); \
        else \
@@ -370,7 +358,7 @@ USUAL_WINDRES_FOR_TARGET = ` \
    if [ -f $$r/binutils/windres ] ; then \
      echo $$r/binutils/windres ; \
    else \
-    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+    if [ '$(host)' = '$(target)' ] ; then \
        echo $(WINDRES); \
      else \
         echo windres | sed '$(program_transform_name)' ; \
@@ -396,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)" \
@@ -459,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
@@ -524,30 +512,21 @@ 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=/`" \
-       "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s/.*=$$/XFOO=/`" \
-       "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s/.*=$$/XFOO=/`" \
-       "`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=/`"
-
-GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
+       "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+       "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+       "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+       "`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 'STAGE1_CFLAGS=$(STAGE1_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_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
  
  .PHONY: configure-host
  configure-host: maybe-configure-gcc  \
@@ -632,7 +611,8 @@ configure-target:  \
      maybe-configure-target-zlib \
      maybe-configure-target-boehm-gc \
      maybe-configure-target-qthreads \
-    maybe-configure-target-rda
+    maybe-configure-target-rda \
+    maybe-configure-target-libada
  
  # The target built for a native build.
  .PHONY: all.normal
@@ -721,7 +701,8 @@ all-target:  \
      maybe-all-target-zlib \
      maybe-all-target-boehm-gc \
      maybe-all-target-qthreads \
-    maybe-all-target-rda
+    maybe-all-target-rda \
+    maybe-all-target-libada
  
  # Do a target for all the subdirectories.  A ``make do-X'' will do a
  # ``make X'' in all subdirectories (because, in general, there is a
@@ -815,7 +796,8 @@ info-target:  \
      maybe-info-target-zlib \
      maybe-info-target-boehm-gc \
      maybe-info-target-qthreads \
-    maybe-info-target-rda
+    maybe-info-target-rda \
+    maybe-info-target-libada
  
  # GCC, the eternal special case
  .PHONY: maybe-info-gcc info-gcc
@@ -823,8 +805,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|"`; \
@@ -846,8 +828,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|"`; \
@@ -868,8 +850,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|"`; \
@@ -890,8 +872,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|"`; \
@@ -912,8 +894,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|"`; \
@@ -934,8 +916,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|"`; \
@@ -956,8 +938,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|"`; \
@@ -978,8 +960,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|"`; \
@@ -1000,8 +982,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|"`; \
@@ -1022,8 +1004,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|"`; \
@@ -1044,8 +1026,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|"`; \
@@ -1066,8 +1048,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|"`; \
@@ -1088,8 +1070,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|"`; \
@@ -1110,8 +1092,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|"`; \
@@ -1132,8 +1114,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|"`; \
@@ -1154,8 +1136,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|"`; \
@@ -1176,8 +1158,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|"`; \
@@ -1198,8 +1180,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|"`; \
@@ -1220,8 +1202,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|"`; \
@@ -1242,8 +1224,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|"`; \
@@ -1264,8 +1246,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|"`; \
@@ -1286,8 +1268,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|"`; \
@@ -1308,8 +1290,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|"`; \
@@ -1330,8 +1312,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|"`; \
@@ -1352,8 +1334,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|"`; \
@@ -1374,8 +1356,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|"`; \
@@ -1396,8 +1378,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|"`; \
@@ -1418,8 +1400,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|"`; \
@@ -1440,8 +1422,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|"`; \
@@ -1462,8 +1444,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|"`; \
@@ -1484,8 +1466,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|"`; \
@@ -1506,8 +1488,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|"`; \
@@ -1528,8 +1510,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|"`; \
@@ -1550,8 +1532,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|"`; \
@@ -1572,8 +1554,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|"`; \
@@ -1594,8 +1576,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|"`; \
@@ -1616,8 +1598,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|"`; \
@@ -1638,8 +1620,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|"`; \
@@ -1660,8 +1642,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|"`; \
@@ -1682,8 +1664,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|"`; \
@@ -1704,8 +1686,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|"`; \
@@ -1726,8 +1708,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|"`; \
@@ -1748,8 +1730,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|"`; \
@@ -1770,8 +1752,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|"`; \
@@ -1792,8 +1774,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|"`; \
@@ -1814,8 +1796,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|"`; \
@@ -1836,8 +1818,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|"`; \
@@ -1858,8 +1840,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|"`; \
@@ -1880,8 +1862,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|"`; \
@@ -1902,8 +1884,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|"`; \
@@ -1924,8 +1906,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|"`; \
@@ -1946,8 +1928,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|"`; \
@@ -1968,8 +1950,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|"`; \
@@ -1990,8 +1972,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|"`; \
@@ -2012,8 +1994,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|"`; \
@@ -2034,8 +2016,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|"`; \
@@ -2056,8 +2038,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|"`; \
@@ -2078,8 +2060,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|"`; \
@@ -2100,8 +2082,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|"`; \
@@ -2122,8 +2104,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|"`; \
@@ -2144,8 +2126,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|"`; \
@@ -2166,8 +2148,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|"`; \
@@ -2188,8 +2170,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|"`; \
@@ -2210,8 +2192,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|"`; \
@@ -2232,8 +2214,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|"`; \
@@ -2257,8 +2239,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 \
@@ -2279,8 +2261,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 \
@@ -2301,8 +2283,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 \
@@ -2323,8 +2305,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 \
@@ -2345,8 +2327,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 \
@@ -2367,8 +2349,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 \
@@ -2389,8 +2371,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 \
@@ -2411,8 +2393,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 \
@@ -2433,8 +2415,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 \
@@ -2455,8 +2437,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 \
@@ -2477,8 +2459,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 \
@@ -2499,8 +2481,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 \
@@ -2521,8 +2503,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 \
@@ -2543,8 +2525,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 \
@@ -2565,8 +2547,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 \
@@ -2587,8 +2569,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 \
@@ -2603,6 +2585,28 @@ info-target-rda: \
           || exit 1
  
  
+.PHONY: maybe-info-target-libada info-target-libada
+maybe-info-target-libada:
+
+info-target-libada: \
+    configure-target-libada 
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       echo "Doing info in $(TARGET_SUBDIR)/libada" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 info) \
+         || exit 1
+
+
  
  .PHONY: do-dvi
  do-dvi: dvi-host dvi-target
@@ -2691,7 +2695,8 @@ dvi-target:  \
      maybe-dvi-target-zlib \
      maybe-dvi-target-boehm-gc \
      maybe-dvi-target-qthreads \
-    maybe-dvi-target-rda
+    maybe-dvi-target-rda \
+    maybe-dvi-target-libada
  
  # GCC, the eternal special case
  .PHONY: maybe-dvi-gcc dvi-gcc
@@ -2699,8 +2704,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|"`; \
@@ -2722,8 +2727,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|"`; \
@@ -2744,8 +2749,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|"`; \
@@ -2766,8 +2771,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|"`; \
@@ -2788,8 +2793,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|"`; \
@@ -2810,8 +2815,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|"`; \
@@ -2832,8 +2837,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|"`; \
@@ -2854,8 +2859,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|"`; \
@@ -2876,8 +2881,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|"`; \
@@ -2898,8 +2903,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|"`; \
@@ -2920,8 +2925,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|"`; \
@@ -2942,8 +2947,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|"`; \
@@ -2964,8 +2969,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|"`; \
@@ -2986,8 +2991,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|"`; \
@@ -3008,8 +3013,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|"`; \
@@ -3030,8 +3035,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|"`; \
@@ -3052,8 +3057,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|"`; \
@@ -3074,8 +3079,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|"`; \
@@ -3096,8 +3101,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|"`; \
@@ -3118,8 +3123,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|"`; \
@@ -3140,8 +3145,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|"`; \
@@ -3162,8 +3167,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|"`; \
@@ -3184,8 +3189,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|"`; \
@@ -3206,8 +3211,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|"`; \
@@ -3228,8 +3233,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|"`; \
@@ -3250,8 +3255,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|"`; \
@@ -3272,8 +3277,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|"`; \
@@ -3294,8 +3299,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|"`; \
@@ -3316,8 +3321,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|"`; \
@@ -3338,8 +3343,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|"`; \
@@ -3360,8 +3365,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|"`; \
@@ -3382,8 +3387,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|"`; \
@@ -3404,8 +3409,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|"`; \
@@ -3426,8 +3431,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|"`; \
@@ -3448,8 +3453,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|"`; \
@@ -3470,8 +3475,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|"`; \
@@ -3492,8 +3497,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|"`; \
@@ -3514,8 +3519,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|"`; \
@@ -3536,8 +3541,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|"`; \
@@ -3558,8 +3563,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|"`; \
@@ -3580,8 +3585,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|"`; \
@@ -3602,8 +3607,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|"`; \
@@ -3624,8 +3629,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|"`; \
@@ -3646,8 +3651,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|"`; \
@@ -3668,8 +3673,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|"`; \
@@ -3690,8 +3695,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|"`; \
@@ -3712,8 +3717,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|"`; \
@@ -3734,8 +3739,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|"`; \
@@ -3756,8 +3761,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|"`; \
@@ -3778,8 +3783,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|"`; \
@@ -3800,8 +3805,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|"`; \
@@ -3822,8 +3827,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|"`; \
@@ -3844,8 +3849,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|"`; \
@@ -3866,8 +3871,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|"`; \
@@ -3888,8 +3893,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|"`; \
@@ -3910,8 +3915,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|"`; \
@@ -3932,8 +3937,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|"`; \
@@ -3954,8 +3959,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|"`; \
@@ -3976,8 +3981,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|"`; \
@@ -3998,8 +4003,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|"`; \
@@ -4020,8 +4025,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|"`; \
@@ -4042,8 +4047,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|"`; \
@@ -4064,8 +4069,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|"`; \
@@ -4086,8 +4091,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|"`; \
@@ -4108,8 +4113,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|"`; \
@@ -4133,8 +4138,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 \
@@ -4155,8 +4160,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 \
@@ -4177,8 +4182,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 \
@@ -4199,8 +4204,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 \
@@ -4221,8 +4226,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 \
@@ -4243,8 +4248,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 \
@@ -4265,8 +4270,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 \
@@ -4287,8 +4292,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 \
@@ -4309,8 +4314,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 \
@@ -4331,8 +4336,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 \
@@ -4353,8 +4358,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 \
@@ -4375,8 +4380,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 \
@@ -4397,8 +4402,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 \
@@ -4419,8 +4424,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 \
@@ -4441,8 +4446,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 \
@@ -4463,8 +4468,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 \
@@ -4479,6 +4484,28 @@ dvi-target-rda: \
           || exit 1
  
  
+.PHONY: maybe-dvi-target-libada dvi-target-libada
+maybe-dvi-target-libada:
+
+dvi-target-libada: \
+    configure-target-libada 
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       echo "Doing dvi in $(TARGET_SUBDIR)/libada" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 dvi) \
+         || exit 1
+
+
  
  .PHONY: do-TAGS
  do-TAGS: TAGS-host TAGS-target
@@ -4567,7 +4594,8 @@ TAGS-target:  \
      maybe-TAGS-target-zlib \
      maybe-TAGS-target-boehm-gc \
      maybe-TAGS-target-qthreads \
-    maybe-TAGS-target-rda
+    maybe-TAGS-target-rda \
+    maybe-TAGS-target-libada
  
  # GCC, the eternal special case
  .PHONY: maybe-TAGS-gcc TAGS-gcc
@@ -4575,8 +4603,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|"`; \
@@ -4598,8 +4626,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|"`; \
@@ -4620,8 +4648,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|"`; \
@@ -4642,8 +4670,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|"`; \
@@ -4664,8 +4692,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|"`; \
@@ -4686,8 +4714,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|"`; \
@@ -4708,8 +4736,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|"`; \
@@ -4730,8 +4758,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|"`; \
@@ -4752,8 +4780,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|"`; \
@@ -4774,8 +4802,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|"`; \
@@ -4796,8 +4824,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|"`; \
@@ -4818,8 +4846,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|"`; \
@@ -4840,8 +4868,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|"`; \
@@ -4862,8 +4890,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|"`; \
@@ -4884,8 +4912,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|"`; \
@@ -4906,8 +4934,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|"`; \
@@ -4928,8 +4956,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|"`; \
@@ -4950,8 +4978,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|"`; \
@@ -4972,8 +5000,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|"`; \
@@ -4994,8 +5022,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|"`; \
@@ -5016,8 +5044,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|"`; \
@@ -5038,8 +5066,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|"`; \
@@ -5060,8 +5088,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|"`; \
@@ -5082,8 +5110,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|"`; \
@@ -5104,8 +5132,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|"`; \
@@ -5126,8 +5154,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|"`; \
@@ -5148,8 +5176,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|"`; \
@@ -5170,8 +5198,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|"`; \
@@ -5192,8 +5220,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|"`; \
@@ -5214,8 +5242,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|"`; \
@@ -5236,8 +5264,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|"`; \
@@ -5258,8 +5286,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|"`; \
@@ -5280,8 +5308,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|"`; \
@@ -5302,8 +5330,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|"`; \
@@ -5324,8 +5352,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|"`; \
@@ -5346,8 +5374,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|"`; \
@@ -5368,8 +5396,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|"`; \
@@ -5390,8 +5418,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|"`; \
@@ -5412,8 +5440,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|"`; \
@@ -5434,8 +5462,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|"`; \
@@ -5456,8 +5484,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|"`; \
@@ -5478,8 +5506,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|"`; \
@@ -5500,8 +5528,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|"`; \
@@ -5522,8 +5550,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|"`; \
@@ -5544,8 +5572,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|"`; \
@@ -5566,8 +5594,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|"`; \
@@ -5588,8 +5616,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|"`; \
@@ -5610,8 +5638,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|"`; \
@@ -5632,8 +5660,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|"`; \
@@ -5654,8 +5682,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|"`; \
@@ -5676,8 +5704,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|"`; \
@@ -5698,8 +5726,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|"`; \
@@ -5720,8 +5748,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|"`; \
@@ -5742,8 +5770,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|"`; \
@@ -5764,8 +5792,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|"`; \
@@ -5786,8 +5814,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|"`; \
@@ -5808,8 +5836,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|"`; \
@@ -5830,8 +5858,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|"`; \
@@ -5852,8 +5880,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|"`; \
@@ -5874,8 +5902,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|"`; \
@@ -5896,8 +5924,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|"`; \
@@ -5918,8 +5946,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|"`; \
@@ -5940,8 +5968,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|"`; \
@@ -5962,8 +5990,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|"`; \
@@ -5984,8 +6012,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|"`; \
@@ -6009,8 +6037,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 \
@@ -6031,8 +6059,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 \
@@ -6053,8 +6081,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 \
@@ -6075,8 +6103,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 \
@@ -6097,8 +6125,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 \
@@ -6119,8 +6147,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 \
@@ -6141,8 +6169,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 \
@@ -6163,8 +6191,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 \
@@ -6185,8 +6213,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 \
@@ -6207,8 +6235,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 \
@@ -6229,8 +6257,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 \
@@ -6251,8 +6279,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 \
@@ -6273,8 +6301,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 \
@@ -6295,8 +6323,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 \
@@ -6317,8 +6345,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 \
@@ -6339,8 +6367,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 \
@@ -6355,6 +6383,28 @@ TAGS-target-rda: \
           || exit 1
  
  
+.PHONY: maybe-TAGS-target-libada TAGS-target-libada
+maybe-TAGS-target-libada:
+
+TAGS-target-libada: \
+    configure-target-libada 
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       echo "Doing TAGS in $(TARGET_SUBDIR)/libada" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 TAGS) \
+         || exit 1
+
+
  
  .PHONY: do-install-info
  do-install-info: install-info-host install-info-target
@@ -6443,7 +6493,8 @@ install-info-target:  \
      maybe-install-info-target-zlib \
      maybe-install-info-target-boehm-gc \
      maybe-install-info-target-qthreads \
-    maybe-install-info-target-rda
+    maybe-install-info-target-rda \
+    maybe-install-info-target-libada
  
  # GCC, the eternal special case
  .PHONY: maybe-install-info-gcc install-info-gcc
@@ -6452,8 +6503,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|"`; \
@@ -6476,8 +6527,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|"`; \
@@ -6499,8 +6550,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|"`; \
@@ -6522,8 +6573,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|"`; \
@@ -6545,8 +6596,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|"`; \
@@ -6568,8 +6619,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|"`; \
@@ -6591,8 +6642,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|"`; \
@@ -6614,8 +6665,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|"`; \
@@ -6637,8 +6688,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|"`; \
@@ -6660,8 +6711,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|"`; \
@@ -6683,8 +6734,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|"`; \
@@ -6706,8 +6757,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|"`; \
@@ -6729,8 +6780,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|"`; \
@@ -6752,8 +6803,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|"`; \
@@ -6775,8 +6826,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|"`; \
@@ -6798,8 +6849,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|"`; \
@@ -6821,8 +6872,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|"`; \
@@ -6844,8 +6895,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|"`; \
@@ -6867,8 +6918,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|"`; \
@@ -6890,8 +6941,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|"`; \
@@ -6913,8 +6964,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|"`; \
@@ -6936,8 +6987,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|"`; \
@@ -6959,8 +7010,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|"`; \
@@ -6982,8 +7033,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|"`; \
@@ -7005,8 +7056,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|"`; \
@@ -7028,8 +7079,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|"`; \
@@ -7051,8 +7102,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|"`; \
@@ -7074,8 +7125,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|"`; \
@@ -7097,8 +7148,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|"`; \
@@ -7120,8 +7171,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|"`; \
@@ -7143,8 +7194,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|"`; \
@@ -7166,8 +7217,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|"`; \
@@ -7189,8 +7240,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|"`; \
@@ -7212,8 +7263,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|"`; \
@@ -7235,8 +7286,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|"`; \
@@ -7258,8 +7309,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|"`; \
@@ -7281,8 +7332,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|"`; \
@@ -7304,8 +7355,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|"`; \
@@ -7327,8 +7378,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|"`; \
@@ -7350,8 +7401,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|"`; \
@@ -7373,8 +7424,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|"`; \
@@ -7396,8 +7447,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|"`; \
@@ -7419,8 +7470,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|"`; \
@@ -7442,8 +7493,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|"`; \
@@ -7465,8 +7516,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|"`; \
@@ -7488,8 +7539,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|"`; \
@@ -7511,8 +7562,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|"`; \
@@ -7534,8 +7585,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|"`; \
@@ -7557,8 +7608,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|"`; \
@@ -7580,8 +7631,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|"`; \
@@ -7603,8 +7654,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|"`; \
@@ -7626,8 +7677,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|"`; \
@@ -7649,8 +7700,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|"`; \
@@ -7672,8 +7723,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|"`; \
@@ -7695,8 +7746,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|"`; \
@@ -7718,8 +7769,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|"`; \
@@ -7741,8 +7792,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|"`; \
@@ -7764,8 +7815,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|"`; \
@@ -7787,8 +7838,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|"`; \
@@ -7810,8 +7861,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|"`; \
@@ -7833,8 +7884,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|"`; \
@@ -7856,8 +7907,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|"`; \
@@ -7879,8 +7930,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|"`; \
@@ -7902,8 +7953,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|"`; \
@@ -7925,8 +7976,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|"`; \
@@ -7951,8 +8002,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 \
@@ -7974,8 +8025,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 \
@@ -7997,8 +8048,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 \
@@ -8020,8 +8071,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 \
@@ -8043,8 +8094,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 \
@@ -8066,8 +8117,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 \
@@ -8089,8 +8140,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 \
@@ -8112,8 +8163,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 \
@@ -8135,8 +8186,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 \
@@ -8158,8 +8209,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 \
@@ -8181,8 +8232,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 \
@@ -8204,8 +8255,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 \
@@ -8227,8 +8278,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 \
@@ -8250,8 +8301,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 \
@@ -8273,8 +8324,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 \
@@ -8296,8 +8347,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 \
@@ -8312,6 +8363,29 @@ install-info-target-rda: \
           || exit 1
  
  
+.PHONY: maybe-install-info-target-libada install-info-target-libada
+maybe-install-info-target-libada:
+
+install-info-target-libada: \
+    configure-target-libada \
+    info-target-libada 
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       echo "Doing install-info in $(TARGET_SUBDIR)/libada" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 install-info) \
+         || exit 1
+
+
  
  .PHONY: do-installcheck
  do-installcheck: installcheck-host installcheck-target
@@ -8400,7 +8474,8 @@ installcheck-target:  \
      maybe-installcheck-target-zlib \
      maybe-installcheck-target-boehm-gc \
      maybe-installcheck-target-qthreads \
-    maybe-installcheck-target-rda
+    maybe-installcheck-target-rda \
+    maybe-installcheck-target-libada
  
  # GCC, the eternal special case
  .PHONY: maybe-installcheck-gcc installcheck-gcc
@@ -8408,8 +8483,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|"`; \
@@ -8431,8 +8506,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|"`; \
@@ -8453,8 +8528,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|"`; \
@@ -8475,8 +8550,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|"`; \
@@ -8497,8 +8572,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|"`; \
@@ -8519,8 +8594,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|"`; \
@@ -8541,8 +8616,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|"`; \
@@ -8563,8 +8638,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|"`; \
@@ -8585,8 +8660,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|"`; \
@@ -8607,8 +8682,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|"`; \
@@ -8629,8 +8704,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|"`; \
@@ -8651,8 +8726,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|"`; \
@@ -8673,8 +8748,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|"`; \
@@ -8695,8 +8770,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|"`; \
@@ -8717,8 +8792,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|"`; \
@@ -8739,8 +8814,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|"`; \
@@ -8761,8 +8836,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|"`; \
@@ -8783,8 +8858,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|"`; \
@@ -8805,8 +8880,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|"`; \
@@ -8827,8 +8902,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|"`; \
@@ -8849,8 +8924,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|"`; \
@@ -8871,8 +8946,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|"`; \
@@ -8893,8 +8968,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|"`; \
@@ -8915,8 +8990,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|"`; \
@@ -8937,8 +9012,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|"`; \
@@ -8959,8 +9034,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|"`; \
@@ -8981,8 +9056,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|"`; \
@@ -9003,8 +9078,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|"`; \
@@ -9025,8 +9100,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|"`; \
@@ -9047,8 +9122,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|"`; \
@@ -9069,8 +9144,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|"`; \
@@ -9091,8 +9166,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|"`; \
@@ -9113,8 +9188,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|"`; \
@@ -9135,8 +9210,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|"`; \
@@ -9157,8 +9232,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|"`; \
@@ -9179,8 +9254,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|"`; \
@@ -9201,8 +9276,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|"`; \
@@ -9223,8 +9298,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|"`; \
@@ -9245,8 +9320,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|"`; \
@@ -9267,8 +9342,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|"`; \
@@ -9289,8 +9364,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|"`; \
@@ -9311,8 +9386,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|"`; \
@@ -9333,8 +9408,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|"`; \
@@ -9355,8 +9430,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|"`; \
@@ -9377,8 +9452,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|"`; \
@@ -9399,8 +9474,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|"`; \
@@ -9421,8 +9496,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|"`; \
@@ -9443,8 +9518,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|"`; \
@@ -9465,8 +9540,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|"`; \
@@ -9487,8 +9562,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|"`; \
@@ -9509,8 +9584,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|"`; \
@@ -9531,8 +9606,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|"`; \
@@ -9553,8 +9628,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|"`; \
@@ -9575,8 +9650,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|"`; \
@@ -9597,8 +9672,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|"`; \
@@ -9619,8 +9694,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|"`; \
@@ -9641,8 +9716,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|"`; \
@@ -9663,8 +9738,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|"`; \
@@ -9685,8 +9760,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|"`; \
@@ -9707,8 +9782,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|"`; \
@@ -9729,8 +9804,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|"`; \
@@ -9751,8 +9826,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|"`; \
@@ -9773,8 +9848,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|"`; \
@@ -9795,8 +9870,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|"`; \
@@ -9817,8 +9892,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|"`; \
@@ -9842,8 +9917,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 \
@@ -9864,8 +9939,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 \
@@ -9886,8 +9961,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 \
@@ -9908,8 +9983,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 \
@@ -9930,8 +10005,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 \
@@ -9952,8 +10027,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 \
@@ -9974,8 +10049,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 \
@@ -9996,8 +10071,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 \
@@ -10018,8 +10093,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 \
@@ -10040,8 +10115,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 \
@@ -10062,8 +10137,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 \
@@ -10084,8 +10159,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 \
@@ -10106,8 +10181,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 \
@@ -10128,8 +10203,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 \
@@ -10150,8 +10225,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 \
@@ -10172,8 +10247,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 \
@@ -10188,6 +10263,28 @@ installcheck-target-rda: \
           || exit 1
  
  
+.PHONY: maybe-installcheck-target-libada installcheck-target-libada
+maybe-installcheck-target-libada:
+
+installcheck-target-libada: \
+    configure-target-libada 
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       echo "Doing installcheck in $(TARGET_SUBDIR)/libada" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 installcheck) \
+         || exit 1
+
+
  
  .PHONY: do-mostlyclean
  do-mostlyclean: mostlyclean-host mostlyclean-target
@@ -10276,15 +10373,16 @@ mostlyclean-target:  \
      maybe-mostlyclean-target-zlib \
      maybe-mostlyclean-target-boehm-gc \
      maybe-mostlyclean-target-qthreads \
-    maybe-mostlyclean-target-rda
+    maybe-mostlyclean-target-rda \
+    maybe-mostlyclean-target-libada
  
  # GCC, the eternal special case
  .PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
  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|"`; \
@@ -10305,8 +10403,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|"`; \
@@ -10326,8 +10424,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|"`; \
@@ -10347,8 +10445,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|"`; \
@@ -10368,8 +10466,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|"`; \
@@ -10389,8 +10487,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|"`; \
@@ -10410,8 +10508,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|"`; \
@@ -10431,8 +10529,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|"`; \
@@ -10452,8 +10550,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|"`; \
@@ -10473,8 +10571,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|"`; \
@@ -10494,8 +10592,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|"`; \
@@ -10515,8 +10613,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|"`; \
@@ -10536,8 +10634,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|"`; \
@@ -10557,8 +10655,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|"`; \
@@ -10578,8 +10676,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|"`; \
@@ -10599,8 +10697,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|"`; \
@@ -10620,8 +10718,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|"`; \
@@ -10641,8 +10739,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|"`; \
@@ -10662,8 +10760,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|"`; \
@@ -10683,8 +10781,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|"`; \
@@ -10704,8 +10802,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|"`; \
@@ -10725,8 +10823,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|"`; \
@@ -10746,8 +10844,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|"`; \
@@ -10767,8 +10865,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|"`; \
@@ -10788,8 +10886,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|"`; \
@@ -10809,8 +10907,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|"`; \
@@ -10830,8 +10928,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|"`; \
@@ -10851,8 +10949,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|"`; \
@@ -10872,8 +10970,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|"`; \
@@ -10900,8 +10998,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|"`; \
@@ -10921,8 +11019,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|"`; \
@@ -10942,8 +11040,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|"`; \
@@ -10963,8 +11061,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|"`; \
@@ -10984,8 +11082,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|"`; \
@@ -11005,8 +11103,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|"`; \
@@ -11026,8 +11124,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|"`; \
@@ -11047,8 +11145,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|"`; \
@@ -11068,8 +11166,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|"`; \
@@ -11089,8 +11187,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|"`; \
@@ -11110,8 +11208,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|"`; \
@@ -11131,8 +11229,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|"`; \
@@ -11152,8 +11250,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|"`; \
@@ -11173,8 +11271,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|"`; \
@@ -11194,8 +11292,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|"`; \
@@ -11215,8 +11313,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|"`; \
@@ -11236,8 +11334,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|"`; \
@@ -11257,8 +11355,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|"`; \
@@ -11278,8 +11376,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|"`; \
@@ -11299,8 +11397,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|"`; \
@@ -11320,8 +11418,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|"`; \
@@ -11341,8 +11439,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|"`; \
@@ -11362,8 +11460,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|"`; \
@@ -11383,8 +11481,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|"`; \
@@ -11404,8 +11502,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|"`; \
@@ -11425,8 +11523,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|"`; \
@@ -11446,8 +11544,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|"`; \
@@ -11467,8 +11565,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|"`; \
@@ -11488,8 +11586,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|"`; \
@@ -11509,8 +11607,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|"`; \
@@ -11530,8 +11628,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|"`; \
@@ -11551,8 +11649,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|"`; \
@@ -11572,8 +11670,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|"`; \
@@ -11600,8 +11698,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|"`; \
@@ -11624,8 +11722,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 \
@@ -11645,8 +11743,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 \
@@ -11666,8 +11764,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 \
@@ -11687,8 +11785,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 \
@@ -11707,7 +11805,7 @@ mostlyclean-target-libobjc:
  maybe-mostlyclean-target-libtermcap:
  
  # libtermcap doesn't support mostlyclean.
-mostlyclean-libtermcap:
+mostlyclean-target-libtermcap:
  
  
  .PHONY: maybe-mostlyclean-target-winsup mostlyclean-target-winsup
@@ -11715,8 +11813,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 \
@@ -11736,8 +11834,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 \
@@ -11757,8 +11855,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 \
@@ -11778,8 +11876,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 \
@@ -11799,8 +11897,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 \
@@ -11820,8 +11918,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 \
@@ -11841,8 +11939,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 \
@@ -11862,8 +11960,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 \
@@ -11883,8 +11981,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 \
@@ -11904,8 +12002,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 \
@@ -11925,8 +12023,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 \
@@ -11941,6 +12039,27 @@ mostlyclean-target-rda:
           || exit 1
  
  
+.PHONY: maybe-mostlyclean-target-libada mostlyclean-target-libada
+maybe-mostlyclean-target-libada:
+
+mostlyclean-target-libada: 
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 mostlyclean) \
+         || exit 1
+
+
  
  .PHONY: do-clean
  do-clean: clean-host clean-target
@@ -12029,15 +12148,16 @@ clean-target:  \
      maybe-clean-target-zlib \
      maybe-clean-target-boehm-gc \
      maybe-clean-target-qthreads \
-    maybe-clean-target-rda
+    maybe-clean-target-rda \
+    maybe-clean-target-libada
  
  # GCC, the eternal special case
  .PHONY: maybe-clean-gcc clean-gcc
  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|"`; \
@@ -12058,8 +12178,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|"`; \
@@ -12079,8 +12199,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|"`; \
@@ -12100,8 +12220,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|"`; \
@@ -12121,8 +12241,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|"`; \
@@ -12142,8 +12262,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|"`; \
@@ -12163,8 +12283,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|"`; \
@@ -12184,8 +12304,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|"`; \
@@ -12205,8 +12325,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|"`; \
@@ -12226,8 +12346,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|"`; \
@@ -12247,8 +12367,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|"`; \
@@ -12268,8 +12388,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|"`; \
@@ -12289,8 +12409,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|"`; \
@@ -12310,8 +12430,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|"`; \
@@ -12331,8 +12451,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|"`; \
@@ -12352,8 +12472,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|"`; \
@@ -12373,8 +12493,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|"`; \
@@ -12394,8 +12514,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|"`; \
@@ -12415,8 +12535,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|"`; \
@@ -12436,8 +12556,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|"`; \
@@ -12457,8 +12577,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|"`; \
@@ -12478,8 +12598,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|"`; \
@@ -12499,8 +12619,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|"`; \
@@ -12520,8 +12640,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|"`; \
@@ -12541,8 +12661,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|"`; \
@@ -12562,8 +12682,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|"`; \
@@ -12583,8 +12703,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|"`; \
@@ -12604,8 +12724,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|"`; \
@@ -12625,8 +12745,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|"`; \
@@ -12646,8 +12766,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|"`; \
@@ -12667,8 +12787,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|"`; \
@@ -12688,8 +12808,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|"`; \
@@ -12709,8 +12829,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|"`; \
@@ -12730,8 +12850,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|"`; \
@@ -12751,8 +12871,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|"`; \
@@ -12772,8 +12892,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|"`; \
@@ -12793,8 +12913,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|"`; \
@@ -12814,8 +12934,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|"`; \
@@ -12835,8 +12955,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|"`; \
@@ -12856,8 +12976,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|"`; \
@@ -12877,8 +12997,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|"`; \
@@ -12898,8 +13018,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|"`; \
@@ -12919,8 +13039,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|"`; \
@@ -12940,8 +13060,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|"`; \
@@ -12961,8 +13081,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|"`; \
@@ -12982,8 +13102,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|"`; \
@@ -13003,8 +13123,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|"`; \
@@ -13024,8 +13144,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|"`; \
@@ -13045,8 +13165,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|"`; \
@@ -13066,8 +13186,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|"`; \
@@ -13087,8 +13207,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|"`; \
@@ -13108,8 +13228,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|"`; \
@@ -13129,8 +13249,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|"`; \
@@ -13150,8 +13270,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|"`; \
@@ -13171,8 +13291,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|"`; \
@@ -13192,8 +13312,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|"`; \
@@ -13213,8 +13333,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|"`; \
@@ -13234,8 +13354,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|"`; \
@@ -13255,8 +13375,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|"`; \
@@ -13276,8 +13396,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|"`; \
@@ -13297,8 +13417,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|"`; \
@@ -13318,8 +13438,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|"`; \
@@ -13339,8 +13459,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|"`; \
@@ -13367,8 +13487,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|"`; \
@@ -13391,8 +13511,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 \
@@ -13412,8 +13532,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 \
@@ -13433,8 +13553,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 \
@@ -13454,8 +13574,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 \
@@ -13474,7 +13594,7 @@ clean-target-libobjc:
  maybe-clean-target-libtermcap:
  
  # libtermcap doesn't support clean.
-clean-libtermcap:
+clean-target-libtermcap:
  
  
  .PHONY: maybe-clean-target-winsup clean-target-winsup
@@ -13482,8 +13602,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 \
@@ -13503,8 +13623,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 \
@@ -13524,8 +13644,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 \
@@ -13545,8 +13665,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 \
@@ -13566,8 +13686,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 \
@@ -13587,8 +13707,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 \
@@ -13608,8 +13728,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 \
@@ -13629,8 +13749,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 \
@@ -13650,8 +13770,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 \
@@ -13671,8 +13791,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 \
@@ -13692,8 +13812,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 \
@@ -13708,6 +13828,27 @@ clean-target-rda:
           || exit 1
  
  
+.PHONY: maybe-clean-target-libada clean-target-libada
+maybe-clean-target-libada:
+
+clean-target-libada: 
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       echo "Doing clean in $(TARGET_SUBDIR)/libada" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 clean) \
+         || exit 1
+
+
  
  .PHONY: do-distclean
  do-distclean: distclean-host distclean-target
@@ -13796,15 +13937,16 @@ distclean-target:  \
      maybe-distclean-target-zlib \
      maybe-distclean-target-boehm-gc \
      maybe-distclean-target-qthreads \
-    maybe-distclean-target-rda
+    maybe-distclean-target-rda \
+    maybe-distclean-target-libada
  
  # GCC, the eternal special case
  .PHONY: maybe-distclean-gcc distclean-gcc
  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|"`; \
@@ -13825,8 +13967,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|"`; \
@@ -13846,8 +13988,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|"`; \
@@ -13867,8 +14009,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|"`; \
@@ -13888,8 +14030,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|"`; \
@@ -13909,8 +14051,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|"`; \
@@ -13930,8 +14072,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|"`; \
@@ -13951,8 +14093,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|"`; \
@@ -13972,8 +14114,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|"`; \
@@ -13993,8 +14135,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|"`; \
@@ -14014,8 +14156,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|"`; \
@@ -14035,8 +14177,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|"`; \
@@ -14056,8 +14198,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|"`; \
@@ -14077,8 +14219,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|"`; \
@@ -14098,8 +14240,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|"`; \
@@ -14119,8 +14261,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|"`; \
@@ -14140,8 +14282,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|"`; \
@@ -14161,8 +14303,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|"`; \
@@ -14182,8 +14324,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|"`; \
@@ -14203,8 +14345,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|"`; \
@@ -14224,8 +14366,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|"`; \
@@ -14245,8 +14387,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|"`; \
@@ -14266,8 +14408,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|"`; \
@@ -14287,8 +14429,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|"`; \
@@ -14308,8 +14450,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|"`; \
@@ -14329,8 +14471,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|"`; \
@@ -14350,8 +14492,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|"`; \
@@ -14371,8 +14513,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|"`; \
@@ -14392,8 +14534,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|"`; \
@@ -14413,8 +14555,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|"`; \
@@ -14434,8 +14576,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|"`; \
@@ -14455,8 +14597,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|"`; \
@@ -14476,8 +14618,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|"`; \
@@ -14497,8 +14639,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|"`; \
@@ -14518,8 +14660,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|"`; \
@@ -14539,8 +14681,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|"`; \
@@ -14560,8 +14702,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|"`; \
@@ -14581,8 +14723,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|"`; \
@@ -14602,8 +14744,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|"`; \
@@ -14623,8 +14765,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|"`; \
@@ -14644,8 +14786,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|"`; \
@@ -14665,8 +14807,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|"`; \
@@ -14686,8 +14828,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|"`; \
@@ -14707,8 +14849,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|"`; \
@@ -14728,8 +14870,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|"`; \
@@ -14749,8 +14891,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|"`; \
@@ -14770,8 +14912,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|"`; \
@@ -14791,8 +14933,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|"`; \
@@ -14812,8 +14954,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|"`; \
@@ -14833,8 +14975,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|"`; \
@@ -14854,8 +14996,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|"`; \
@@ -14875,8 +15017,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|"`; \
@@ -14896,8 +15038,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|"`; \
@@ -14917,8 +15059,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|"`; \
@@ -14938,8 +15080,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|"`; \
@@ -14959,8 +15101,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|"`; \
@@ -14980,8 +15122,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|"`; \
@@ -15001,8 +15143,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|"`; \
@@ -15022,8 +15164,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|"`; \
@@ -15043,8 +15185,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|"`; \
@@ -15064,8 +15206,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|"`; \
@@ -15085,8 +15227,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|"`; \
@@ -15106,8 +15248,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|"`; \
@@ -15134,8 +15276,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|"`; \
@@ -15158,8 +15300,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 \
@@ -15179,8 +15321,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 \
@@ -15200,8 +15342,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 \
@@ -15221,8 +15363,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 \
@@ -15241,7 +15383,7 @@ distclean-target-libobjc:
  maybe-distclean-target-libtermcap:
  
  # libtermcap doesn't support distclean.
-distclean-libtermcap:
+distclean-target-libtermcap:
  
  
  .PHONY: maybe-distclean-target-winsup distclean-target-winsup
@@ -15249,8 +15391,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 \
@@ -15270,8 +15412,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 \
@@ -15291,8 +15433,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 \
@@ -15312,8 +15454,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 \
@@ -15333,8 +15475,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 \
@@ -15354,8 +15496,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 \
@@ -15375,8 +15517,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 \
@@ -15396,8 +15538,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 \
@@ -15417,8 +15559,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 \
@@ -15438,8 +15580,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 \
@@ -15459,8 +15601,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 \
@@ -15475,6 +15617,27 @@ distclean-target-rda:
           || exit 1
  
  
+.PHONY: maybe-distclean-target-libada distclean-target-libada
+maybe-distclean-target-libada:
+
+distclean-target-libada: 
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       echo "Doing distclean in $(TARGET_SUBDIR)/libada" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 distclean) \
+         || exit 1
+
+
  
  .PHONY: do-maintainer-clean
  do-maintainer-clean: maintainer-clean-host maintainer-clean-target
@@ -15563,15 +15726,16 @@ maintainer-clean-target:  \
      maybe-maintainer-clean-target-zlib \
      maybe-maintainer-clean-target-boehm-gc \
      maybe-maintainer-clean-target-qthreads \
-    maybe-maintainer-clean-target-rda
+    maybe-maintainer-clean-target-rda \
+    maybe-maintainer-clean-target-libada
  
  # GCC, the eternal special case
  .PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
  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|"`; \
@@ -15592,8 +15756,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|"`; \
@@ -15613,8 +15777,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|"`; \
@@ -15634,8 +15798,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|"`; \
@@ -15655,8 +15819,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|"`; \
@@ -15676,8 +15840,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|"`; \
@@ -15697,8 +15861,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|"`; \
@@ -15718,8 +15882,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|"`; \
@@ -15739,8 +15903,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|"`; \
@@ -15760,8 +15924,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|"`; \
@@ -15781,8 +15945,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|"`; \
@@ -15802,8 +15966,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|"`; \
@@ -15823,8 +15987,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|"`; \
@@ -15844,8 +16008,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|"`; \
@@ -15865,8 +16029,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|"`; \
@@ -15886,8 +16050,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|"`; \
@@ -15907,8 +16071,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|"`; \
@@ -15928,8 +16092,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|"`; \
@@ -15949,8 +16113,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|"`; \
@@ -15970,8 +16134,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|"`; \
@@ -15991,8 +16155,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|"`; \
@@ -16012,8 +16176,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|"`; \
@@ -16033,8 +16197,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|"`; \
@@ -16054,8 +16218,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|"`; \
@@ -16075,8 +16239,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|"`; \
@@ -16096,8 +16260,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|"`; \
@@ -16117,8 +16281,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|"`; \
@@ -16138,8 +16302,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|"`; \
@@ -16159,8 +16323,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|"`; \
@@ -16180,8 +16344,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|"`; \
@@ -16201,8 +16365,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|"`; \
@@ -16222,8 +16386,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|"`; \
@@ -16243,8 +16407,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|"`; \
@@ -16264,8 +16428,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|"`; \
@@ -16285,8 +16449,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|"`; \
@@ -16306,8 +16470,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|"`; \
@@ -16327,8 +16491,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|"`; \
@@ -16348,8 +16512,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|"`; \
@@ -16369,8 +16533,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|"`; \
@@ -16390,8 +16554,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|"`; \
@@ -16411,8 +16575,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|"`; \
@@ -16432,8 +16596,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|"`; \
@@ -16453,8 +16617,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|"`; \
@@ -16474,8 +16638,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|"`; \
@@ -16495,8 +16659,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|"`; \
@@ -16516,8 +16680,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|"`; \
@@ -16537,8 +16701,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|"`; \
@@ -16558,8 +16722,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|"`; \
@@ -16579,8 +16743,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|"`; \
@@ -16600,8 +16764,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|"`; \
@@ -16621,8 +16785,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|"`; \
@@ -16642,8 +16806,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|"`; \
@@ -16663,8 +16827,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|"`; \
@@ -16684,8 +16848,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|"`; \
@@ -16705,8 +16869,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|"`; \
@@ -16726,8 +16890,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|"`; \
@@ -16747,8 +16911,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|"`; \
@@ -16768,8 +16932,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|"`; \
@@ -16789,8 +16953,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|"`; \
@@ -16810,8 +16974,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|"`; \
@@ -16831,8 +16995,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|"`; \
@@ -16852,8 +17016,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|"`; \
@@ -16873,8 +17037,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|"`; \
@@ -16901,8 +17065,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|"`; \
@@ -16925,8 +17089,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 \
@@ -16946,8 +17110,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 \
@@ -16967,8 +17131,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 \
@@ -16988,8 +17152,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 \
@@ -17008,7 +17172,7 @@ maintainer-clean-target-libobjc:
  maybe-maintainer-clean-target-libtermcap:
  
  # libtermcap doesn't support maintainer-clean.
-maintainer-clean-libtermcap:
+maintainer-clean-target-libtermcap:
  
  
  .PHONY: maybe-maintainer-clean-target-winsup maintainer-clean-target-winsup
@@ -17016,8 +17180,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 \
@@ -17037,8 +17201,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 \
@@ -17058,8 +17222,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 \
@@ -17079,8 +17243,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 \
@@ -17100,8 +17264,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 \
@@ -17121,8 +17285,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 \
@@ -17142,8 +17306,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 \
@@ -17163,8 +17327,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 \
@@ -17184,8 +17348,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 \
@@ -17205,8 +17369,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 \
@@ -17226,8 +17390,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 \
@@ -17242,6 +17406,27 @@ maintainer-clean-target-rda:
           || exit 1
  
  
+.PHONY: maybe-maintainer-clean-target-libada maintainer-clean-target-libada
+maybe-maintainer-clean-target-libada:
+
+maintainer-clean-target-libada: 
+       @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+       r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libada" ; \
+       for flag in $(EXTRA_TARGET_FLAGS); do \
+         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+       done; \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                 "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+                 "RANLIB=$${RANLIB}" \
+                 "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+                 maintainer-clean) \
+         || exit 1
+
+
  
  
  # Here are the targets which correspond to the do-X targets.
@@ -17258,7 +17443,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
@@ -17301,8 +17486,7 @@ clean-target-libgcc:
  # Check target.
  
  .PHONY: check do-check
-check:
-       $(MAKE) do-check NOTPARALLEL=parallel-ok
+check: do-check
  
  # Only include modules actually being configured and built.
  do-check: maybe-check-gcc  \
@@ -17385,7 +17569,8 @@ do-check: maybe-check-gcc  \
      maybe-check-target-zlib \
      maybe-check-target-boehm-gc \
      maybe-check-target-qthreads \
-    maybe-check-target-rda
+    maybe-check-target-rda \
+    maybe-check-target-libada
  
  # Automated reporting of test results.
  
@@ -17564,7 +17749,8 @@ install-target:  \
      maybe-install-target-zlib \
      maybe-install-target-boehm-gc \
      maybe-install-target-qthreads \
-    maybe-install-target-rda
+    maybe-install-target-rda \
+    maybe-install-target-libada
  
  uninstall:
         @echo "the uninstall target is not supported in this tree"
@@ -17572,7 +17758,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) ; \
@@ -17624,14 +17810,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; \
@@ -17685,8 +17871,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)
  
  
@@ -17699,10 +17885,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; \
@@ -17735,8 +17922,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)
  
@@ -17744,8 +17931,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)
  
@@ -17754,8 +17941,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)
  
@@ -17765,10 +17952,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; \
@@ -17801,8 +17989,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)
  
@@ -17810,8 +17998,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)
  
@@ -17820,8 +18008,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)
  
@@ -17831,10 +18019,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; \
@@ -17867,8 +18056,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)
  
@@ -17876,8 +18065,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)
  
@@ -17886,8 +18075,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)
  
@@ -17897,10 +18086,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; \
@@ -17933,8 +18123,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)
  
@@ -17942,8 +18132,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)
  
@@ -17952,8 +18142,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)
  
@@ -17963,10 +18153,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; \
@@ -17999,8 +18190,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)
  
@@ -18008,8 +18199,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)
  
@@ -18018,8 +18209,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)
  
@@ -18029,10 +18220,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; \
@@ -18065,8 +18257,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)
  
@@ -18074,8 +18266,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)
  
@@ -18084,8 +18276,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)
  
@@ -18095,10 +18287,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; \
@@ -18131,8 +18324,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)
  
@@ -18140,8 +18333,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)
  
@@ -18150,8 +18343,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)
  
@@ -18161,10 +18354,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; \
@@ -18197,8 +18391,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)
  
@@ -18207,9 +18401,9 @@ maybe-check-bison:
  
  # This module is only tested in a native toolchain.
  check-bison:
-       @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+       @if [ '$(host)' = '$(target)' ] ; then \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd bison && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
@@ -18219,8 +18413,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)
  
@@ -18230,10 +18424,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; \
@@ -18266,8 +18461,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)
  
@@ -18276,9 +18471,9 @@ maybe-check-byacc:
  
  # This module is only tested in a native toolchain.
  check-byacc:
-       @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+       @if [ '$(host)' = '$(target)' ] ; then \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd byacc && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
@@ -18288,8 +18483,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)
  
@@ -18299,10 +18494,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; \
@@ -18335,8 +18531,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)
  
@@ -18344,8 +18540,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)
  
@@ -18354,8 +18550,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)
  
@@ -18365,10 +18561,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; \
@@ -18401,8 +18598,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)
  
@@ -18410,8 +18607,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)
  
@@ -18420,8 +18617,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)
  
@@ -18431,10 +18628,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; \
@@ -18467,8 +18665,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)
  
@@ -18476,8 +18674,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)
  
@@ -18486,8 +18684,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)
  
@@ -18497,10 +18695,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; \
@@ -18533,8 +18732,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)
  
@@ -18548,8 +18747,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)
  
@@ -18559,10 +18758,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; \
@@ -18595,8 +18795,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)
  
@@ -18604,8 +18804,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)
  
@@ -18614,8 +18814,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)
  
@@ -18625,10 +18825,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; \
@@ -18661,8 +18862,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)
  
@@ -18671,9 +18872,9 @@ maybe-check-fastjar:
  
  # This module is only tested in a native toolchain.
  check-fastjar:
-       @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+       @if [ '$(host)' = '$(target)' ] ; then \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
@@ -18683,8 +18884,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)
  
@@ -18694,10 +18895,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; \
@@ -18730,8 +18932,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)
  
@@ -18739,8 +18941,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)
  
@@ -18749,8 +18951,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)
  
@@ -18760,10 +18962,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; \
@@ -18796,8 +18999,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)
  
@@ -18805,8 +19008,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)
  
@@ -18815,8 +19018,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)
  
@@ -18826,10 +19029,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; \
@@ -18862,8 +19066,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)
  
@@ -18871,8 +19075,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)
  
@@ -18881,8 +19085,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)
  
@@ -18892,10 +19096,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; \
@@ -18928,8 +19133,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)
  
@@ -18938,9 +19143,9 @@ maybe-check-flex:
  
  # This module is only tested in a native toolchain.
  check-flex:
-       @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+       @if [ '$(host)' = '$(target)' ] ; then \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd flex && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
@@ -18950,8 +19155,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)
  
@@ -18961,10 +19166,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; \
@@ -18997,8 +19203,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)
  
@@ -19006,8 +19212,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)
  
@@ -19016,8 +19222,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)
  
@@ -19027,10 +19233,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; \
@@ -19063,8 +19270,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)
  
@@ -19072,8 +19279,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)
  
@@ -19082,8 +19289,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)
  
@@ -19093,10 +19300,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; \
@@ -19129,8 +19337,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)
  
@@ -19138,8 +19346,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)
  
@@ -19148,8 +19356,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)
  
@@ -19159,10 +19367,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; \
@@ -19195,8 +19404,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)
  
@@ -19204,8 +19413,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)
  
@@ -19214,8 +19423,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)
  
@@ -19225,10 +19434,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; \
@@ -19261,8 +19471,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)
  
@@ -19270,8 +19480,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)
  
@@ -19280,8 +19490,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)
  
@@ -19291,10 +19501,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; \
@@ -19327,8 +19538,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)
  
@@ -19336,8 +19547,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)
  
@@ -19346,8 +19557,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)
  
@@ -19357,10 +19568,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; \
@@ -19393,8 +19605,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)
  
@@ -19402,8 +19614,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)
  
@@ -19412,8 +19624,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)
  
@@ -19423,10 +19635,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; \
@@ -19459,8 +19672,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)
  
@@ -19468,8 +19681,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)
  
@@ -19478,8 +19691,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)
  
@@ -19489,10 +19702,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; \
@@ -19525,8 +19739,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)
  
@@ -19534,8 +19748,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)
  
@@ -19544,8 +19758,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)
  
@@ -19555,10 +19769,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; \
@@ -19591,8 +19806,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)
  
@@ -19600,8 +19815,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)
  
@@ -19610,8 +19825,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)
  
@@ -19621,10 +19836,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; \
@@ -19657,8 +19873,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)
  
@@ -19666,8 +19882,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)
  
@@ -19676,8 +19892,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)
  
@@ -19687,10 +19903,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; \
@@ -19723,8 +19940,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)
  
@@ -19732,8 +19949,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)
  
@@ -19742,8 +19959,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)
  
@@ -19753,10 +19970,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; \
@@ -19789,8 +20007,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)
  
@@ -19798,8 +20016,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)
  
@@ -19808,8 +20026,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)
  
@@ -19819,10 +20037,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; \
@@ -19855,8 +20074,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)
  
@@ -19864,8 +20083,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)
  
@@ -19874,8 +20093,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)
  
@@ -19885,10 +20104,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; \
@@ -19921,8 +20141,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)
  
@@ -19930,8 +20150,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)
  
@@ -19940,8 +20160,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)
  
@@ -19951,10 +20171,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; \
@@ -19987,8 +20208,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)
  
@@ -19996,8 +20217,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)
  
@@ -20006,8 +20227,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)
  
@@ -20017,10 +20238,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; \
@@ -20053,8 +20275,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)
  
@@ -20062,8 +20284,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)
  
@@ -20072,8 +20294,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)
  
@@ -20083,10 +20305,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; \
@@ -20119,8 +20342,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)
  
@@ -20134,8 +20357,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)
  
@@ -20145,10 +20368,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; \
@@ -20181,8 +20405,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)
  
@@ -20190,8 +20414,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)
  
@@ -20200,8 +20424,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)
  
@@ -20211,10 +20435,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; \
@@ -20247,8 +20472,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)
  
@@ -20256,8 +20481,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)
  
@@ -20266,8 +20491,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)
  
@@ -20277,10 +20502,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; \
@@ -20313,8 +20539,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)
  
@@ -20322,8 +20548,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)
  
@@ -20332,8 +20558,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)
  
@@ -20343,10 +20569,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; \
@@ -20379,8 +20606,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)
  
@@ -20388,8 +20615,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)
  
@@ -20398,8 +20625,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)
  
@@ -20409,10 +20636,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; \
@@ -20445,8 +20673,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)
  
@@ -20454,8 +20682,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)
  
@@ -20464,8 +20692,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)
  
@@ -20475,10 +20703,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; \
@@ -20511,8 +20740,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)
  
@@ -20533,10 +20762,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; \
@@ -20569,8 +20799,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)
  
@@ -20578,8 +20808,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)
  
@@ -20588,8 +20818,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)
  
@@ -20599,10 +20829,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; \
@@ -20635,8 +20866,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)
  
@@ -20644,8 +20875,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)
  
@@ -20654,8 +20885,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)
  
@@ -20665,10 +20896,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; \
@@ -20701,8 +20933,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)
  
@@ -20710,8 +20942,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)
  
@@ -20720,8 +20952,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)
  
@@ -20731,10 +20963,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; \
@@ -20767,8 +21000,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)
  
@@ -20776,8 +21009,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)
  
@@ -20786,8 +21019,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)
  
@@ -20797,10 +21030,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; \
@@ -20833,8 +21067,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)
  
@@ -20842,8 +21076,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)
  
@@ -20852,8 +21086,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)
  
@@ -20863,10 +21097,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; \
@@ -20899,8 +21134,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)
  
@@ -20908,8 +21143,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)
  
@@ -20918,8 +21153,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)
  
@@ -20929,10 +21164,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; \
@@ -20965,8 +21201,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)
  
@@ -20974,8 +21210,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)
  
@@ -20984,8 +21220,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)
  
@@ -20995,10 +21231,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; \
@@ -21031,8 +21268,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)
  
@@ -21040,8 +21277,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)
  
@@ -21057,10 +21294,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; \
@@ -21093,8 +21331,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)
  
@@ -21102,8 +21340,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)
  
@@ -21112,8 +21350,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)
  
@@ -21123,10 +21361,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; \
@@ -21159,8 +21398,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)
  
@@ -21168,8 +21407,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)
  
@@ -21178,8 +21417,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)
  
@@ -21189,10 +21428,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; \
@@ -21225,8 +21465,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)
  
@@ -21234,8 +21474,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)
  
@@ -21244,8 +21484,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)
  
@@ -21255,10 +21495,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; \
@@ -21291,8 +21532,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)
  
@@ -21300,8 +21541,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)
  
@@ -21310,8 +21551,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)
  
@@ -21321,10 +21562,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; \
@@ -21357,8 +21599,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)
  
@@ -21367,9 +21609,9 @@ maybe-check-zip:
  
  # This module is only tested in a native toolchain.
  check-zip:
-       @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
-         r=`${PWD}`; export r; \
-         s=`cd $(srcdir); ${PWD}`; export s; \
+       @if [ '$(host)' = '$(target)' ] ; then \
+         r=`${PWD_COMMAND}`; export r; \
+         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
           $(SET_LIB_PATH) \
           (cd zip && $(MAKE) $(FLAGS_TO_PASS) check); \
         fi
@@ -21379,8 +21621,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)
  
@@ -21390,10 +21632,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; \
@@ -21426,8 +21669,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)
  
@@ -21448,10 +21691,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; \
@@ -21484,8 +21728,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)
  
@@ -21493,8 +21737,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)
  
@@ -21503,8 +21747,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)
  
@@ -21514,10 +21758,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; \
@@ -21550,8 +21795,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)
  
@@ -21559,8 +21804,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)
  
@@ -21569,8 +21814,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)
  
@@ -21580,10 +21825,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; \
@@ -21616,8 +21862,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)
  
@@ -21625,8 +21871,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)
  
@@ -21635,8 +21881,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)
  
@@ -21646,10 +21892,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; \
@@ -21682,8 +21929,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)
  
@@ -21691,8 +21938,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)
  
@@ -21701,8 +21948,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)
  
@@ -21712,10 +21959,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; \
@@ -21748,8 +21996,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)
  
@@ -21757,8 +22005,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)
  
@@ -21767,8 +22015,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)
  
@@ -21778,10 +22026,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; \
@@ -21814,8 +22063,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)
  
@@ -21829,8 +22078,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)
  
@@ -21840,10 +22089,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; \
@@ -21876,8 +22126,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)
  
@@ -21891,8 +22141,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)
  
@@ -21907,22 +22157,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; \
@@ -21945,30 +22194,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} \
@@ -21978,8 +22205,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)
@@ -21988,8 +22215,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)
@@ -21999,8 +22226,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)
@@ -22011,22 +22238,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; \
@@ -22048,30 +22274,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} \
@@ -22081,8 +22285,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)
@@ -22091,8 +22295,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)
@@ -22102,8 +22306,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)
@@ -22114,22 +22318,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; \
@@ -22151,30 +22354,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} \
@@ -22184,8 +22365,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)
@@ -22194,8 +22375,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)
@@ -22205,8 +22386,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)
@@ -22217,22 +22398,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; \
@@ -22254,30 +22434,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} \
@@ -22287,8 +22445,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)
@@ -22297,8 +22455,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)
@@ -22308,8 +22466,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)
@@ -22320,22 +22478,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; \
@@ -22390,8 +22547,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)
@@ -22407,8 +22564,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)
@@ -22419,22 +22576,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; \
@@ -22456,30 +22612,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} \
@@ -22489,8 +22623,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)
@@ -22499,8 +22633,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)
@@ -22510,8 +22644,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)
@@ -22522,22 +22656,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; \
@@ -22559,30 +22692,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} \
@@ -22592,8 +22703,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)
@@ -22609,8 +22720,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)
@@ -22621,22 +22732,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; \
@@ -22658,30 +22768,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} \
@@ -22691,8 +22779,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)
@@ -22701,8 +22789,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)
@@ -22712,8 +22800,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)
@@ -22724,22 +22812,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; \
@@ -22761,30 +22848,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} \
@@ -22794,8 +22859,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)
@@ -22804,8 +22869,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)
@@ -22815,8 +22880,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)
@@ -22827,22 +22892,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; \
@@ -22864,30 +22928,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} \
@@ -22897,8 +22939,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)
@@ -22922,22 +22964,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; \
@@ -22959,30 +23000,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} \
@@ -22992,8 +23011,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)
@@ -23002,8 +23021,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)
@@ -23013,8 +23032,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)
@@ -23025,22 +23044,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; \
@@ -23063,30 +23081,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} \
@@ -23096,8 +23092,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)
@@ -23106,8 +23102,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)
@@ -23117,8 +23113,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)
@@ -23129,22 +23125,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; \
@@ -23199,8 +23194,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)
@@ -23209,8 +23204,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)
@@ -23220,8 +23215,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)
@@ -23232,22 +23227,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; \
@@ -23269,30 +23263,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} \
@@ -23302,8 +23274,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)
@@ -23312,8 +23284,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)
@@ -23323,8 +23295,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)
@@ -23335,22 +23307,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; \
@@ -23372,30 +23343,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} \
@@ -23405,8 +23354,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)
@@ -23415,8 +23364,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)
@@ -23426,8 +23375,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)
@@ -23438,22 +23387,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; \
@@ -23475,30 +23423,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} \
@@ -23508,8 +23434,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)
@@ -23518,8 +23444,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)
@@ -23529,13 +23455,93 @@ 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)
  
  
+.PHONY: configure-target-libada maybe-configure-target-libada
+maybe-configure-target-libada:
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libada/multilib.out: multilib.out
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
+       rm -f $(TARGET_SUBDIR)/libada/Makefile || : ; \
+       cp multilib.out $(TARGET_SUBDIR)/libada/multilib.out
+
+configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
+       @test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
+       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; \
+       GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+       DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+       LD="$(LD_FOR_TARGET)"; export LD; \
+       LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+       NM="$(NM_FOR_TARGET)"; export NM; \
+       RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+       WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+       echo Configuring in $(TARGET_SUBDIR)/libada; \
+       cd "$(TARGET_SUBDIR)/libada" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) \
+           topdir=$(srcdir) ;; \
+         *) \
+           case "$(TARGET_SUBDIR)" in \
+             .) topdir="../$(srcdir)" ;; \
+             *) topdir="../../$(srcdir)" ;; \
+           esac ;; \
+       esac; \
+         srcdiroption="--srcdir=$${topdir}/libada"; \
+         libsrcdir="$$s/libada"; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+         $(TARGET_CONFIGARGS) $${srcdiroption} \
+         --with-target-subdir="$(TARGET_SUBDIR)" \
+         || exit 1
+
+.PHONY: all-target-libada maybe-all-target-libada
+maybe-all-target-libada:
+all-target-libada: configure-target-libada
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  all)
+
+.PHONY: check-target-libada maybe-check-target-libada
+maybe-check-target-libada:
+
+check-target-libada:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS)  check)
+
+
+.PHONY: install-target-libada maybe-install-target-libada
+maybe-install-target-libada:
+
+install-target-libada: installdirs
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(SET_LIB_PATH) \
+       (cd $(TARGET_SUBDIR)/libada && \
+         $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
+
+
  
  # ----------
  # GCC module
@@ -23546,15 +23552,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; \
@@ -23592,13 +23602,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
@@ -23616,13 +23626,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"; \
@@ -23640,38 +23650,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) \
@@ -23681,8 +23691,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 \
@@ -23692,8 +23702,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 \
@@ -23701,15 +23711,14 @@ check-gcc-c++:
         fi
  
  .PHONY: check-c++
-check-c++:
-       $(MAKE) check-target-libstdc++-v3 check-gcc-c++ NOTPARALLEL=parallel-ok
+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 \
@@ -23728,8 +23737,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); \
@@ -23750,16 +23759,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
@@ -23810,7 +23820,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
@@ -23827,6 +23837,7 @@ ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3
  configure-target-boehm-gc: $(ALL_GCC_C) maybe-configure-target-qthreads
  configure-target-fastjar: maybe-configure-target-zlib
  all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty
+configure-target-libada: $(ALL_GCC_C)
  configure-target-libf2c: $(ALL_GCC_C)
  all-target-libf2c: maybe-all-target-libiberty
  configure-target-libffi: $(ALL_GCC_C) 
@@ -23873,7 +23884,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 ; \
@@ -23888,7 +23899,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
@@ -23899,12 +23910,6 @@ $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
  # Special directives to GNU Make
  # ------------------------------
  
-# Tell GNU make 3.79 not to run the top level in parallel.  This 
-# prevents contention for $builddir/$target/config.cache, as well
-# as minimizing scatter in file system caches.
-NOTPARALLEL = .NOTPARALLEL
-$(NOTPARALLEL):
-
  # Don't pass command-line variables to submakes.
  .NOEXPORT:
  MAKEOVERRIDES=