Use c_fix = format instead of sed

[pf3gnuchains/gcc-fork.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c2ee34c..72bd8b0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 #
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001 Free Software Foundation
+#   1999, 2000, 2001, 2002 Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,6 +18,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
+# 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):
+
 srcdir = .
 
 prefix = /usr/local
@@ -59,6 +65,12 @@ GDB_NLM_DEPS =
 
 SHELL = /bin/sh
 
+# pwd command to use.  Allow user to override default by setting PWDCMD in
+# 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}
+
 # INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a
 # cygwin host.
 INSTALL_PROGRAM_ARGS =
@@ -94,8 +106,6 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 PICFLAG = 
 PICFLAG_FOR_TARGET = 
 
-CHILLFLAGS = $(CFLAGS)
-CHILL_LIB = -lchill
 CXX = c++
 
 # Use -O2 to stress test the compiler.
@@ -142,7 +152,7 @@ M4 = `if [ -f $$r/m4/m4 ] ; \
 
 # For an installed makeinfo, we require it to be from texinfo 4 or
 # higher, else we use the "missing" dummy.
-MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
+MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
        then echo $$r/texinfo/makeinfo/makeinfo ; \
        else if (makeinfo --version \
          | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \
@@ -172,7 +182,7 @@ OTHERS =
 
 # This is set by the configure script to the list of directories which
 # should be built using the target tools.
-TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib librx winsup opcodes bsp libstub cygmon libf2c libchill libobjc
+TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib librx winsup opcodes bsp libstub cygmon libf2c libobjc
 
 # Target libraries are put under this directory:
 # Changed by configure to $(target_alias) if cross.
@@ -229,7 +239,6 @@ INSTALL_TARGET_CROSS = installdirs \
 # Should be substed by configure.in
 FLAGS_FOR_TARGET =
 CC_FOR_TARGET =
-CHILL_FOR_TARGET =
 CXX_FOR_TARGET =
 CXX_FOR_TARGET_FOR_RECURSIVE_MAKE =
 GCJ_FOR_TARGET =
@@ -353,9 +362,6 @@ BASE_FLAGS_TO_PASS = \
        "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
        "CFLAGS=$(CFLAGS)" \
        "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
-       "CHILLFLAGS=$(CHILLFLAGS)" \
-       "CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \
-       "CHILL_LIB=$(CHILL_LIB)" \
        "GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
        "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
        "CXXFLAGS=$(CXXFLAGS)" \
@@ -743,7 +749,6 @@ ALL_X11_MODULES = \
        all-emacs19 \
        all-gdb \
        all-expect \
-       all-gash \
        all-guile \
        all-tclX \
        all-tk \
@@ -757,7 +762,6 @@ CHECK_X11_MODULES = \
        check-gdb \
        check-guile \
        check-expect \
-       check-gash \
        check-tclX \
        check-tk \
        check-tix
@@ -770,7 +774,6 @@ INSTALL_X11_MODULES = \
        install-gdb \
        install-guile \
        install-expect \
-       install-gash \
        install-tclX \
        install-tk \
        install-tk8.1 \
@@ -783,7 +786,6 @@ ALL_TARGET_MODULES = \
        all-target-librx \
        all-target-newlib \
        all-target-libf2c \
-       all-target-libchill \
        all-target-libobjc \
        all-target-libtermcap \
        all-target-winsup \
@@ -807,7 +809,6 @@ CONFIGURE_TARGET_MODULES = \
        configure-target-librx \
        configure-target-newlib \
        configure-target-libf2c \
-       configure-target-libchill \
        configure-target-libobjc \
        configure-target-libtermcap \
        configure-target-winsup \
@@ -830,7 +831,6 @@ CHECK_TARGET_MODULES = \
        check-target-libstdc++-v3 \
        check-target-newlib \
        check-target-libf2c \
-       check-target-libchill \
        check-target-libobjc \
        check-target-winsup \
        check-target-libiberty \
@@ -847,7 +847,6 @@ INSTALL_TARGET_MODULES = \
        install-target-libstdc++-v3 \
        install-target-newlib \
        install-target-libf2c \
-       install-target-libchill \
        install-target-libobjc \
        install-target-libtermcap \
        install-target-winsup \
@@ -936,7 +935,6 @@ CLEAN_TARGET_MODULES = \
        clean-target-librx \
        clean-target-newlib \
        clean-target-libf2c \
-       clean-target-libchill \
        clean-target-libobjc \
        clean-target-winsup \
        clean-target-libgloss \
@@ -958,7 +956,6 @@ CLEAN_X11_MODULES = \
        clean-emacs19 \
        clean-gdb \
        clean-expect \
-       clean-gash \
        clean-guile \
        clean-tclX \
        clean-tk \
@@ -993,8 +990,8 @@ DO_X = \
 .PHONY: $(DO_X)
 $(DO_X):
        @target=`echo $@ | sed -e 's/^do-//'`; \
-       r=`pwd`; export r; \
-       s=`cd $(srcdir); pwd`; export s; \
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
        $(SET_LIB_PATH) \
        for i in $(SUBDIRS) -dummy-; do \
          if [ -f ./$$i/Makefile ]; then \
@@ -1020,8 +1017,8 @@ $(DO_X):
          else true; fi; \
        done
        @target=`echo $@ | sed -e 's/^do-//'`; \
-       r=`pwd`; export r; \
-       s=`cd $(srcdir); pwd`; export s; \
+       r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
        $(SET_LIB_PATH) \
        for i in $(TARGET_CONFIGDIRS) -dummy-; do \
          if [ -f $(TARGET_SUBDIR)/$$i/Makefile ]; then \
@@ -1051,7 +1048,7 @@ dvi: do-dvi
 do-info: all-texinfo
 
 install-info: do-install-info dir.info
-       s=`cd $(srcdir); pwd`; export s; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
        if [ -f dir.info ] ; then \
          $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \
        else true ; fi
@@ -1086,8 +1083,8 @@ realclean: maintainer-clean
 $(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc:
        @dir=`echo $@ | sed -e 's/clean-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) clean); \
        else \
@@ -1099,8 +1096,8 @@ $(CLEAN_TARGET_MODULES):
        @dir=`echo $@ | sed -e 's/clean-target-//'`; \
        rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
        if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \
        else \
@@ -1116,8 +1113,11 @@ clean-target-libgcc:
 
 # Check target.
 
-.PHONY: check
-check: $(CHECK_MODULES) \
+.PHONY: check do-check
+check:
+       $(MAKE) do-check NOTPARALLEL=parallel-ok
+
+do-check: $(CHECK_MODULES) \
        $(CHECK_TARGET_MODULES) \
        $(CHECK_X11_MODULES) \
        check-gcc
@@ -1170,7 +1170,7 @@ vault-install:
 .PHONY: install.all
 install.all: install-no-fixedincludes
        @if [ -f ./gcc/Makefile ] ; then \
-               r=`pwd` ; export r ; \
+               r=`${PWD}` ; export r ; \
                $(SET_LIB_PATH) \
                (cd ./gcc; \
                $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
@@ -1205,8 +1205,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}`; export r; \
+         s=`cd $(srcdir); ${PWD}` ; export s; \
          $(SET_LIB_PATH) \
          (cd ./gcc; \
           $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
@@ -1220,8 +1220,8 @@ gcc-no-fixedincludes:
 $(ALL_BUILD_MODULES):
        dir=`echo $@ | sed -e 's/all-build-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          (cd $(BUILD_SUBDIR)/$${dir} && $(MAKE) all); \
        else \
          true; \
@@ -1239,8 +1239,8 @@ $(CONFIGURE_BUILD_MODULES):
        elif echo " $(BUILD_CONFIGDIRS) " | grep " $${dir} " >/dev/null 2>&1; then \
          if [ -d $(srcdir)/$${dir} ]; then \
            [ -d $(BUILD_SUBDIR)/$${dir} ] || mkdir $(BUILD_SUBDIR)/$${dir};\
-           r=`pwd`; export r; \
-           s=`cd $(srcdir); pwd`; export s; \
+           r=`${PWD}`; export r; \
+           s=`cd $(srcdir); ${PWD}`; export s; \
            AR="$(AR_FOR_BUILD)"; export AR; \
            AS="$(AS_FOR_BUILD)"; export AS; \
            CC="$(CC_FOR_BUILD)"; export CC; \
@@ -1324,8 +1324,8 @@ $(CONFIGURE_BUILD_MODULES):
 $(ALL_MODULES) all-gui all-libproc:
        @dir=`echo $@ | sed -e 's/all-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) all); \
        else \
@@ -1341,8 +1341,8 @@ $(NATIVE_CHECK_MODULES):
        @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
          dir=`echo $@ | sed -e 's/check-//'`; \
          if [ -f ./$${dir}/Makefile ] ; then \
-           r=`pwd`; export r; \
-           s=`cd $(srcdir); pwd`; export s; \
+           r=`${PWD}`; export r; \
+           s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
            (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
          else \
@@ -1353,8 +1353,8 @@ $(NATIVE_CHECK_MODULES):
 $(CROSS_CHECK_MODULES):
        @dir=`echo $@ | sed -e 's/check-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
        else \
@@ -1367,8 +1367,8 @@ $(CROSS_CHECK_MODULES):
 $(INSTALL_MODULES): installdirs
        @dir=`echo $@ | sed -e 's/install-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
        else \
@@ -1381,7 +1381,7 @@ $(INSTALL_MODULES): installdirs
 $(CONFIGURE_TARGET_MODULES):
        @dir=`echo $@ | sed -e 's/configure-target-//'`; \
        if [ -d $(TARGET_SUBDIR)/$${dir} ]; then \
-         r=`pwd`; export r; \
+         r=`${PWD}`; export r; \
          $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/$${dir}/tmpmulti.out 2> /dev/null; \
          if [ -s $(TARGET_SUBDIR)/$${dir}/tmpmulti.out ]; then \
            if [ -f $(TARGET_SUBDIR)/$${dir}/multilib.out ]; then \
@@ -1405,8 +1405,8 @@ $(CONFIGURE_TARGET_MODULES):
        elif echo " $(TARGET_CONFIGDIRS) " | grep " $${dir} " >/dev/null 2>&1; then \
          if [ -d $(srcdir)/$${dir} ]; then \
            [ -d $(TARGET_SUBDIR)/$${dir} ] || mkdir $(TARGET_SUBDIR)/$${dir};\
-           r=`pwd`; export r; \
-           s=`cd $(srcdir); pwd`; export s; \
+           r=`${PWD}`; export r; \
+           s=`cd $(srcdir); ${PWD}`; export s; \
            $(SET_LIB_PATH) \
            AR="$(AR_FOR_TARGET)"; export AR; \
            AS="$(AS_FOR_TARGET)"; export AS; \
@@ -1487,8 +1487,8 @@ $(CONFIGURE_TARGET_MODULES):
 $(ALL_TARGET_MODULES):
        @dir=`echo $@ | sed -e 's/all-target-//'`; \
        if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd $(TARGET_SUBDIR)/$${dir}; \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \
@@ -1502,8 +1502,8 @@ $(ALL_TARGET_MODULES):
 $(CHECK_TARGET_MODULES):
        @dir=`echo $@ | sed -e 's/check-target-//'`; \
        if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd $(TARGET_SUBDIR)/$${dir}; \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) check);\
@@ -1518,8 +1518,8 @@ $(CHECK_TARGET_MODULES):
 $(INSTALL_TARGET_MODULES): installdirs
        @dir=`echo $@ | sed -e 's/install-target-//'`; \
        if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd $(TARGET_SUBDIR)/$${dir}; \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install); \
@@ -1533,8 +1533,8 @@ $(INSTALL_TARGET_MODULES): installdirs
 $(ALL_X11_MODULES):
        @dir=`echo $@ | sed -e 's/all-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all); \
@@ -1548,8 +1548,8 @@ $(ALL_X11_MODULES):
 $(CHECK_X11_MODULES):
        @dir=`echo $@ | sed -e 's/check-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check); \
@@ -1563,8 +1563,8 @@ $(CHECK_X11_MODULES):
 $(INSTALL_X11_MODULES): installdirs
        @dir=`echo $@ | sed -e 's/install-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install); \
@@ -1576,8 +1576,8 @@ $(INSTALL_X11_MODULES): installdirs
 .PHONY: all-gcc
 all-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
        else \
@@ -1596,13 +1596,13 @@ all-gcc:
 #
 .PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean
 bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean: all-bootstrap
-       @r=`pwd`; export r; \
-       s=`cd $(srcdir); pwd`; export s; \
+       @r=`${PWD}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; 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}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; export s; \
        case "$@" in \
          *bootstrap4-lean ) \
                        msg="Comparing stage3 and stage4 of the compiler"; \
@@ -1617,21 +1617,21 @@ bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean b
        $(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}`; export r; \
+       s=`cd $(srcdir); ${PWD}` ; export s; \
        $(SET_LIB_PATH) \
        echo "Building runtime libraries"; \
        $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
 
 .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}`; export r; \
+       s=`cd $(srcdir); ${PWD}`; 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}`; export r; \
+       s=`cd $(srcdir); ${PWD}` ; export s; \
        $(SET_LIB_PATH) \
        echo "Building runtime libraries"; \
        $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \
@@ -1640,8 +1640,8 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
 .PHONY: check-gcc
 check-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
        else \
@@ -1651,8 +1651,8 @@ check-gcc:
 .PHONY: check-c++
 check-c++:
        @if [ -f ./gcc/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
          $(MAKE) check-target-libstdc++-v3; \
@@ -1663,8 +1663,8 @@ check-c++:
 .PHONY: install-gcc
 install-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
        else \
@@ -1674,8 +1674,8 @@ install-gcc:
 .PHONY: install-gcc-cross
 install-gcc-cross:
        @if [ -f ./gcc/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" install); \
        else \
@@ -1688,8 +1688,8 @@ install-gcc-cross:
 install-dosrel: installdirs info
        @dir=`echo $@ | sed -e 's/install-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         s=`cd $(srcdir); pwd`; export s; \
+         r=`${PWD}`; export r; \
+         s=`cd $(srcdir); ${PWD}`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
        else \
@@ -1711,7 +1711,7 @@ all-bash:
 all-bfd: all-libiberty all-intl
 all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc all-intl
 all-bison: all-texinfo
-configure-target-boehm-gc: $(ALL_GCC_CXX) configure-target-qthreads
+configure-target-boehm-gc: $(ALL_GCC_C) configure-target-qthreads
 all-target-boehm-gc: configure-target-boehm-gc
 configure-target-bsp: $(ALL_GCC_C)
 all-target-bsp: configure-target-bsp
@@ -1735,7 +1735,6 @@ all-findutils:
 all-find:
 all-flex: all-libiberty all-bison all-byacc
 all-gas: all-libiberty all-opcodes all-bfd all-intl
-all-gash: all-tcl
 all-gawk:
 all-gcc: all-bison all-byacc all-binutils all-gas all-ld all-zlib
 all-bootstrap: all-libiberty all-texinfo all-bison all-byacc all-binutils all-gas all-ld all-zlib
@@ -1767,7 +1766,7 @@ all-build-libiberty: configure-build-libiberty
 
 configure-target-libffi: $(ALL_GCC_C) 
 all-target-libffi: configure-target-libffi
-configure-target-libjava: $(ALL_GCC_CXX) configure-target-zlib configure-target-boehm-gc configure-target-qthreads configure-target-libffi
+configure-target-libjava: $(ALL_GCC_C) configure-target-zlib configure-target-boehm-gc configure-target-qthreads configure-target-libffi
 all-target-libjava: configure-target-libjava all-fastjar all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi
 configure-target-librx: $(ALL_GCC_C)
 all-target-librx: configure-target-librx
@@ -1778,8 +1777,6 @@ all-target-libstub: configure-target-libstub
 all-libtool:
 configure-target-libf2c: $(ALL_GCC_C)
 all-target-libf2c: configure-target-libf2c all-target-libiberty
-configure-target-libchill: $(ALL_GCC_C)
-all-target-libchill: configure-target-libchill all-target-libiberty
 configure-target-libobjc: $(ALL_GCC_C)
 all-target-libobjc: configure-target-libobjc all-target-libiberty
 all-m4: all-libiberty all-texinfo
@@ -1803,7 +1800,7 @@ all-send-pr: all-prms
 all-shellutils:
 all-sid: all-tcl all-tk
 all-sim: all-libiberty all-bfd all-opcodes all-readline all-cgen
-all-snavigator: all-tcl all-tk all-itcl all-db all-grep all-libgui
+all-snavigator: all-tcl all-tk all-itcl all-tix all-db all-grep all-libgui
 all-tar: all-libiberty
 all-tcl:
 all-tcl8.1:
@@ -1835,8 +1832,8 @@ install-sid: install-tcl install-tk
 ### other supporting targets
 
 MAKEDIRS= \
-       $(prefix) \
-       $(exec_prefix)
+       $(DESTDIR)$(prefix) \
+       $(DESTDIR)$(exec_prefix)
 .PHONY: installdirs
 installdirs: mkinstalldirs
        $(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
@@ -1884,7 +1881,9 @@ DEVO_SUPPORT= README Makefile.in configure configure.in \
 # ChangeLog omitted because it may refer to files which are not in this
 # distribution (perhaps it would be better to include it anyway).
 ETC_SUPPORT= Makefile.in configure configure.in standards.texi \
-       make-stds.texi standards.info*
+       make-stds.texi standards.info* configure.texi configure.info* \
+       configbuild.* configdev.*
+
 
 # When you use `make setup-dirs' or `make taz' you should always redefine
 # this macro.
@@ -1892,10 +1891,16 @@ SUPPORT_FILES = list-of-support-files-for-tool-in-question
 
 # NOTE: No double quotes in the below.  It is used within shell script
 # as VER="$(VER)"
-VER = `        if grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
+VER = `        if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null 2>&1; then \
+         sed < bfd/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
+       elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
          sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
-       else \
+       elif test -f $(TOOL)/version.in; then \
+         head -1 $(TOOL)/version.in; \
+       elif grep VERSION $(TOOL)/Makefile.in > /dev/null 2>&1; then \
          sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \
+       else \
+         echo VERSION; \
        fi`
 PACKAGE = $(TOOL)
 
@@ -1909,13 +1914,17 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
                TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
                MD5PROG="$(MD5PROG)" \
                SUPPORT_FILES="$(SUPPORT_FILES)"
-       $(MAKE) -f Makefile.in do-tar-bz2 \
+       $(MAKE) -f Makefile.in do-tar \
+               TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(SUPPORT_FILES)"
+       $(MAKE) -f Makefile.in do-bz2 \
                TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
                MD5PROG="$(MD5PROG)" \
                SUPPORT_FILES="$(SUPPORT_FILES)"
 
-.PHONY: gdb-taz
-gdb-taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
+.PHONY: gdb-tar
+gdb-tar: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
        $(MAKE) -f Makefile.in do-proto-toplev \
                TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
                MD5PROG="$(MD5PROG)" \
@@ -1928,7 +1937,18 @@ gdb-taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
                TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
                MD5PROG="$(MD5PROG)" \
                SUPPORT_FILES="$(SUPPORT_FILES)"
-       $(MAKE) -f Makefile.in do-tar-bz2 \
+       $(MAKE) -f Makefile.in do-tar \
+               TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(SUPPORT_FILES)"
+
+.PHONY: gdb-taz
+gdb-taz: gdb-tar $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
+       $(MAKE) -f Makefile.in gdb-tar \
+               TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(SUPPORT_FILES)"
+       $(MAKE) -f Makefile.in do-bz2 \
                TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
                MD5PROG="$(MD5PROG)" \
                SUPPORT_FILES="$(SUPPORT_FILES)"
@@ -1987,15 +2007,25 @@ do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
        else true; fi
        chmod -R og=u . || chmod og=u `find . -print`
        #
+       # Create .gmo files from .po files.
+       for f in `find . -name '*.po' -type f -print`; do \
+            msgfmt -o `echo $$f | sed -e 's/\.po$$/.gmo/'` $$f ; \
+       done
+       #
        -rm -f $(PACKAGE)-$(VER)
        ln -s proto-toplev $(PACKAGE)-$(VER)
 
-.PHONY: do-tar-bz2
-do-tar-bz2:
-       echo "==> Making $(PACKAGE)-$(VER).tar.bz2"
-       -rm -f $(PACKAGE)-$(VER).tar.bz2
+.PHONY: do-tar
+do-tar:
+       echo "==> Making $(PACKAGE)-$(VER).tar"
+       -rm -f $(PACKAGE)-$(VER).tar
        find $(PACKAGE)-$(VER) -follow -name CVS -prune -o -type f -print \
                | tar cTfh - $(PACKAGE)-$(VER).tar
+
+.PHONY: do-bz2
+do-bz2:
+       echo "==> Bzipping $(PACKAGE)-$(VER).tar.bz2"
+       -rm -f $(PACKAGE)-$(VER).tar.bz2
        $(BZIPPROG) -v -9 $(PACKAGE)-$(VER).tar
 
 .PHONY: do-md5sum
@@ -2052,9 +2082,14 @@ gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
        $(MAKE) -f Makefile.in gdb-taz TOOL=gdb \
                MD5PROG="$(MD5PROG)" \
                SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"
+.PHONY: gdb.tar
+gdb.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
+       $(MAKE) -f Makefile.in gdb-tar TOOL=gdb \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"
 
-.PHONY: dejagnu.tar.bz2
 DEJAGNU_SUPPORT_DIRS=  tcl expect libiberty
+.PHONY: dejagnu.tar.bz2
 dejagnu.tar.bz2: $(DIST_SUPPORT) $(DEJAGNU_SUPPORT_DIRS) dejagnu
        $(MAKE) -f Makefile.in taz TOOL=dejagnu \
                MD5PROG="$(MD5PROG)" \
@@ -2066,6 +2101,11 @@ gdb+dejagnu.tar.bz2: $(DIST_SUPPORT) $(GDBD_SUPPORT_DIRS) gdb
        $(MAKE) -f Makefile.in gdb-taz TOOL=gdb PACKAGE=gdb+dejagnu \
                MD5PROG="$(MD5PROG)" \
                SUPPORT_FILES="$(GDBD_SUPPORT_DIRS)"
+.PHONY: gdb+dejagnu.tar
+gdb+dejagnu.tar: $(DIST_SUPPORT) $(GDBD_SUPPORT_DIRS) gdb
+       $(MAKE) -f Makefile.in gdb-tar TOOL=gdb PACKAGE=gdb+dejagnu \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(GDBD_SUPPORT_DIRS)"
 
 .PHONY: insight.tar.bz2
 INSIGHT_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl tk itcl tix libgui
@@ -2073,6 +2113,11 @@ insight.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
        $(MAKE) -f Makefile.in gdb-taz TOOL=gdb PACKAGE=insight \
                MD5PROG="$(MD5PROG)" \
                SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)"
+.PHONY: insight.tar
+insight.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
+       $(MAKE) -f Makefile.in gdb-tar TOOL=gdb PACKAGE=insight \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)"
 
 .PHONY: insight+dejagnu.tar.bz2
 INSIGHTD_SUPPORT_DIRS= $(INSIGHT_SUPPORT_DIRS) expect dejagnu
@@ -2080,6 +2125,11 @@ insight+dejagnu.tar.bz2: $(DIST_SUPPORT) $(INSIGHTD_SUPPORT_DIRS) gdb
        $(MAKE) -f Makefile.in gdb-taz TOOL=gdb PACKAGE="insight+dejagnu" \
                MD5PROG="$(MD5PROG)" \
                SUPPORT_FILES="$(INSIGHTD_SUPPORT_DIRS)"
+.PHONY: insight+dejagnu.tar
+insight+dejagnu.tar: $(DIST_SUPPORT) $(INSIGHTD_SUPPORT_DIRS) gdb
+       $(MAKE) -f Makefile.in gdb-tar TOOL=gdb PACKAGE="insight+dejagnu" \
+               MD5PROG="$(MD5PROG)" \
+               SUPPORT_FILES="$(INSIGHTD_SUPPORT_DIRS)"
 
 .PHONY: newlib.tar.bz2
 NEWLIB_SUPPORT_DIRS=libgloss