* Makefile.in (CHECK_X11_MODULES): Don't run check-tk.

[deliverable/binutils-gdb.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 89b378129dc488cb4bc55b62a93fd5244b857d31..1170b4dc0cc27b9cf4c1da301767aa6f0a6480f5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,7 +45,7 @@ GDB_NLM_DEPS =
 
 SHELL = /bin/sh
 
-INSTALL = $${srcroot}/install.sh -c
+INSTALL = $$s/install.sh -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
@@ -68,6 +68,7 @@ HOST_PREFIX_1 = loser-
 CFLAGS = -g
 LIBCFLAGS = $(CFLAGS)
 CFLAGS_FOR_TARGET = $(CFLAGS)
+LDFLAGS_FOR_TARGET = 
 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 PICFLAG = 
 PICFLAG_FOR_TARGET = 
@@ -110,7 +111,7 @@ M4 = `if [ -f $$r/m4/m4 ] ; \
        then echo $$r/m4/m4 ; \
        else echo m4 ; fi`
 
-MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
+MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
        then echo $$r/texinfo/makeinfo/makeinfo ; \
        else echo makeinfo ; fi`
 
@@ -123,8 +124,8 @@ EXPECT = `if [ -f $$r/expect/expect ] ; \
        then echo $$r/expect/expect ; \
        else echo expect ; fi`
 
-RUNTEST = `if [ -f $${srcroot}/dejagnu/runtest ] ; \
-       then echo $${srcroot}/dejagnu/runtest ; \
+RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
+       then echo $$s/dejagnu/runtest ; \
        else echo runtest ; fi`
 
 
@@ -170,9 +171,13 @@ INSTALL_TARGET = install-dirs \
 
 
 CC_FOR_TARGET = ` \
-  if [ -f $$r/gcc/Makefile ] ; then \
+  if [ -f $$r/gcc/xgcc ] ; then \
     if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
-      echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \
+      if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \
+        echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/newlib/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+      else \
+        echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+      fi; \
     else \
       echo $$r/gcc/xgcc -B$$r/gcc/; \
     fi; \
@@ -184,9 +189,15 @@ CC_FOR_TARGET = ` \
     fi; \
   fi`
 
+# If CC_FOR_TARGET is not overriden on the command line, then this
+# variable is passed down to the gcc Makefile, where it is used to
+# build libgcc2.a.  We define it here so that it can itself be
+# overridden on the command line.
+GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/
+
 # start-sanitize-chill
 CHILL_FOR_TARGET = ` \
-  if [ -f $$r/gcc/Makefile ] ; then \
+  if [ -f $$r/gcc/xgcc ] ; then \
     echo $$r/gcc/xgcc -B$$r/gcc/ -L$$r/gcc/ch/runtime/; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
@@ -199,9 +210,13 @@ CHILL_FOR_TARGET = ` \
 # end-sanitize-chill
 
 CXX_FOR_TARGET = ` \
-  if [ -f $$r/gcc/Makefile ] ; then \
+  if [ -f $$r/gcc/xgcc ] ; then \
     if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
-      echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \
+      if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \
+        echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/newlib/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+      else \
+        echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+      fi; \
     else \
       echo $$r/gcc/xgcc -B$$r/gcc/; \
     fi; \
@@ -303,7 +318,6 @@ BASE_FLAGS_TO_PASS = \
        "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
        "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
        "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
-       "GCC_FOR_TARGET=$(CC_FOR_TARGET)" \
        "INSTALL=$(INSTALL)" \
        "INSTALL_DATA=$(INSTALL_DATA)" \
        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
@@ -396,6 +410,7 @@ EXTRA_GCC_FLAGS = \
        'HOST_PREFIX_1=$(HOST_PREFIX_1)' \
        'NM=$(NM)' \
        'RANLIB=$$(RANLIB_FOR_TARGET)' \
+       "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
        `if test x"$(LANGUAGES)" != x; then echo "LANGUAGES=$(LANGUAGES)"; fi` \
        `if test x"$(STMP_FIXPROTO)" != x; then echo "STMP_FIXPROTO=$(STMP_FIXPROTO)"; fi` \
        `if test x"$(LIMITS_H_TEST)" != x; then echo "LIMITS_H_TEST=$(LIMITS_H_TEST)"; fi` \
@@ -417,11 +432,13 @@ ALL_MODULES = \
        all-binutils \
        all-byacc \
        all-cvs \
+       all-db \
        all-dejagnu \
        all-diff \
        all-dosutils \
        all-etc \
        all-fileutils \
+       all-findutils \
        all-find \
        all-flex \
        all-gas \
@@ -434,6 +451,7 @@ ALL_MODULES = \
        all-indent \
        all-inet \
        all-ispell \
+       all-itcl \
        all-ld \
        all-libiberty \
        all-m4 \
@@ -477,10 +495,12 @@ CROSS_CHECK_MODULES = \
        check-bfd \
        check-binutils \
        check-cvs \
+       check-db \
        check-dejagnu \
        check-diff \
        check-etc \
        check-fileutils \
+       check-findutils \
        check-find \
        check-gas \
        check-gawk \
@@ -491,6 +511,7 @@ CROSS_CHECK_MODULES = \
        check-indent \
        check-inet \
        check-ispell \
+       check-itcl \
        check-ld \
        check-libiberty \
        check-m4 \
@@ -528,11 +549,13 @@ INSTALL_MODULES = \
        install-binutils \
        install-byacc \
        install-cvs \
+       install-db \
        install-dejagnu \
        install-diff \
        install-dosutils \
        install-etc \
        install-fileutils \
+       install-findutils \
        install-find \
        install-flex \
        install-gas \
@@ -545,6 +568,7 @@ INSTALL_MODULES = \
        install-indent \
        install-inet \
        install-ispell \
+       install-itcl \
        install-ld \
        install-libiberty \
        install-m4 \
@@ -661,11 +685,13 @@ CLEAN_MODULES = \
        clean-binutils \
        clean-byacc \
        clean-cvs \
+       clean-db \
        clean-dejagnu \
        clean-diff \
        clean-dosutils \
        clean-etc \
        clean-fileutils \
+       clean-findutils \
        clean-find \
        clean-flex \
        clean-gas \
@@ -678,6 +704,7 @@ CLEAN_MODULES = \
        clean-indent \
        clean-inet \
        clean-ispell \
+       clean-itcl \
        clean-ld \
        clean-libiberty \
        clean-m4 \
@@ -760,7 +787,7 @@ DO_X = \
 $(DO_X):
        @target=`echo $@ | sed -e 's/^do-//'`; \
        r=`pwd`; export r; \
-       srcroot=`cd $(srcdir); pwd`; export srcroot; \
+       s=`cd $(srcdir); pwd`; export s; \
        $(SET_LIB_PATH) \
        for i in $(SUBDIRS) -dummy-; do \
          if [ -f ./$$i/Makefile ]; then \
@@ -788,7 +815,7 @@ $(DO_X):
        done
        @target=`echo $@ | sed -e 's/^do-//'`; \
        r=`pwd`; export r; \
-       srcroot=`cd $(srcdir); pwd`; export srcroot; \
+       s=`cd $(srcdir); pwd`; export s; \
        $(SET_LIB_PATH) \
        for i in $(TARGET_CONFIGDIRS) -dummy-; do \
          if [ -f $(TARGET_SUBDIR)/$$i/Makefile ]; then \
@@ -815,8 +842,11 @@ info: do-info
 installcheck: do-installcheck
 dvi: do-dvi
 
+# Make sure makeinfo is built before we do a `make info'.
+do-info: all-texinfo
+
 install-info: do-install-info dir.info
-       srcroot=`cd $(srcdir); pwd`; export srcroot; \
+       s=`cd $(srcdir); pwd`; export s; \
        if [ -f dir.info ] ; then \
          $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \
        else true ; fi
@@ -847,7 +877,7 @@ $(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc:
        @dir=`echo $@ | sed -e 's/clean-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) clean); \
        else \
@@ -860,7 +890,7 @@ $(CLEAN_TARGET_MODULES):
        rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
        if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \
        else \
@@ -912,9 +942,9 @@ install.all: install-no-fixedincludes
        fi
 
 # inet-install is used because the I*Net wants DejaGNU installed but
-# not built.
+# not built.  Similarly, gzip is built but not installed.
 inet-install:
-       $(MAKE) INSTALL_MODULES="`echo $(INSTALL_MODULES) | sed -e 's/install-dejagnu//'`" install
+       $(MAKE) INSTALL_MODULES="`echo $(INSTALL_MODULES) | sed -e 's/install-dejagnu//' -e 's/install-gzip//'`" install
 
 # install-no-fixedincludes is used because Cygnus can not distribute
 # the fixed header files.
@@ -939,7 +969,7 @@ gcc-no-fixedincludes:
          touch gcc/stmp-fixinc gcc/include/fixed; \
          rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd` ; export srcroot; \
+         s=`cd $(srcdir); pwd` ; export s; \
          $(SET_LIB_PATH) \
          (cd ./gcc; \
           $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
@@ -958,7 +988,7 @@ $(ALL_MODULES) all-gui all-libproc:
        @dir=`echo $@ | sed -e 's/all-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) all); \
        else \
@@ -975,7 +1005,7 @@ $(NATIVE_CHECK_MODULES):
          dir=`echo $@ | sed -e 's/check-//'`; \
          if [ -f ./$${dir}/Makefile ] ; then \
            r=`pwd`; export r; \
-           srcroot=`cd $(srcdir); pwd`; export srcroot; \
+           s=`cd $(srcdir); pwd`; export s; \
            $(SET_LIB_PATH) \
            (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
          else \
@@ -987,7 +1017,7 @@ $(CROSS_CHECK_MODULES):
        @dir=`echo $@ | sed -e 's/check-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
        else \
@@ -1001,7 +1031,7 @@ $(INSTALL_MODULES): install-dirs
        @dir=`echo $@ | sed -e 's/install-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
        else \
@@ -1013,25 +1043,33 @@ $(INSTALL_MODULES): install-dirs
 .PHONY: $(CONFIGURE_TARGET_MODULES)
 $(CONFIGURE_TARGET_MODULES):
        @dir=`echo $@ | sed -e 's/configure-target-//'`; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
-       if [ -f $(TARGET_SUBDIR)/$${dir}/multilib.out ]; then \
-         if cmp $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out > /dev/null; then \
-           rm -f $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
-         else \
-           echo "Multilibs changed for $${dir}, reconfiguring"; \
-           rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/Makefile; \
-           mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
+       if [ -d $(TARGET_SUBDIR)/$${dir} ]; then \
+         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 \
+             if cmp $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out > /dev/null; then \
+               rm -f $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
+             else \
+               echo "Multilibs changed for $${dir}, reconfiguring"; \
+               rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/Makefile; \
+               mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
+             fi; \
+           else \
+             mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
+           fi; \
          fi; \
-       else \
-         mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
-       fi; \
-       if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
+       fi; exit 0      # break command into two pieces
+       @dir=`echo $@ | sed -e 's/configure-target-//'`; \
+       if [ ! -d $(TARGET_SUBDIR) ]; then \
+         true; \
+       elif [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          true; \
        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; \
-           srcroot=`cd $(srcdir); pwd`; export srcroot; \
+           s=`cd $(srcdir); pwd`; export s; \
            $(SET_LIB_PATH) \
            AR="$(AR_FOR_TARGET)"; export AR; \
            AS="$(AS_FOR_TARGET)"; export AS; \
@@ -1041,6 +1079,7 @@ $(CONFIGURE_TARGET_MODULES):
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
            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; \
            echo Configuring in $(TARGET_SUBDIR)/$${dir}; \
@@ -1056,7 +1095,7 @@ $(CONFIGURE_TARGET_MODULES):
            esac; \
            if [ "$(srcdir)" = "." ] ; then \
              if [ "$(TARGET_SUBDIR)" != "." ] ; then \
-               if $(SHELL) $${srcroot}/symlink-tree $${topdir}/$${dir} "no-such-file" ; then \
+               if $(SHELL) $$s/symlink-tree $${topdir}/$${dir} "no-such-file" ; then \
                  if [ -f Makefile ]; then \
                    if $(MAKE) distclean; then \
                      true; \
@@ -1076,14 +1115,14 @@ $(CONFIGURE_TARGET_MODULES):
              libsrcdir="."; \
            else \
              srcdiroption="--srcdir=$${topdir}/$${dir}"; \
-             libsrcdir="$${srcroot}/$${dir}"; \
+             libsrcdir="$$s/$${dir}"; \
            fi; \
            if [ -f $${libsrcdir}/configure ] ; then \
              $(SHELL) $${libsrcdir}/configure \
                $(CONFIG_ARGUMENTS) $${srcdiroption} \
                --with-target-subdir="$(TARGET_SUBDIR)"; \
            else \
-             $(SHELL) $${srcroot}/configure \
+             $(SHELL) $$s/configure \
                $(CONFIG_ARGUMENTS) $${srcdiroption} \
                --with-target-subdir="$(TARGET_SUBDIR)"; \
            fi; \
@@ -1101,7 +1140,7 @@ $(ALL_TARGET_MODULES):
        @dir=`echo $@ | sed -e 's/all-target-//'`; \
        if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \
        else \
@@ -1115,7 +1154,7 @@ $(CHECK_TARGET_MODULES):
        @dir=`echo $@ | sed -e 's/check-target-//'`; \
        if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd $(TARGET_SUBDIR)/$${dir};$(MAKE) $(TARGET_FLAGS_TO_PASS) check);\
        else \
@@ -1130,7 +1169,7 @@ $(INSTALL_TARGET_MODULES): install-dirs
        @dir=`echo $@ | sed -e 's/install-target-//'`; \
        if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd $(TARGET_SUBDIR)/$${dir}; \
            $(MAKE) $(TARGET_FLAGS_TO_PASS) install); \
@@ -1145,7 +1184,7 @@ $(ALL_X11_MODULES):
        @dir=`echo $@ | sed -e 's/all-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all); \
@@ -1160,7 +1199,7 @@ $(CHECK_X11_MODULES):
        @dir=`echo $@ | sed -e 's/check-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check); \
@@ -1175,7 +1214,7 @@ $(INSTALL_X11_MODULES):
        @dir=`echo $@ | sed -e 's/install-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install); \
@@ -1188,7 +1227,7 @@ $(INSTALL_X11_MODULES):
 all-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
        else \
@@ -1199,7 +1238,7 @@ all-gcc:
 all-bootstrap:
        @if [ -f ./gcc/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) bootstrap); \
        else \
@@ -1210,7 +1249,7 @@ all-bootstrap:
 check-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
        else \
@@ -1221,7 +1260,7 @@ check-gcc:
 install-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
        else \
@@ -1237,7 +1276,7 @@ install-dosrel: install-dirs info
        @dir=`echo $@ | sed -e 's/install-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         s=`cd $(srcdir); pwd`; export s; \
          $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
        else \
@@ -1264,6 +1303,7 @@ configure-target-examples: $(ALL_GCC)
 all-target-examples: configure-target-examples
 all-expect: all-tcl all-tk
 all-fileutils: all-libiberty
+all-findutils:
 all-find:
 all-flex: all-libiberty all-byacc
 all-gas: all-libiberty all-opcodes all-bfd
@@ -1284,6 +1324,7 @@ all-hello: all-libiberty
 all-indent:
 all-inet: all-tcl all-send-pr all-perl
 all-ispell: all-emacs19
+all-itcl: all-tcl all-tk
 all-ld: all-libiberty all-bfd all-opcodes all-byacc all-flex
 configure-target-libg++: $(ALL_GCC) configure-target-librx
 all-target-libg++: configure-target-libg++ all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio all-target-librx all-target-libstdc++
@@ -1321,7 +1362,7 @@ all-textutils:
 all-tgas: all-libiberty all-bfd all-opcodes
 all-time:
 all-wdiff:
-all-target-winsup: all-target-newlib all-target-libiberty configure-target-winsup 
+all-target-winsup: all-target-newlib all-target-libiberty all-target-librx all-target-libio configure-target-winsup 
 configure-target-winsup: configure-target-newlib
 all-uudecode: all-libiberty
 configure-target-libiberty: $(ALL_GCC)
@@ -1392,7 +1433,7 @@ DEVO_SUPPORT= README Makefile.in configure configure.in \
 # Files in devo/etc used in any net release.
 # 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 cfg-paper.texi configure.in configure.man \
+ETC_SUPPORT= Makefile.in cfg-paper.texi configure configure.in configure.man \
        configure.texi standards.texi make-stds.texi \
        configure.info* standards.info* cfg-paper.info*
 
@@ -1469,24 +1510,28 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
          ln -s ../../../texinfo/util/tex3patch proto-toplev/texinfo/util ; \
        else true; fi
        chmod og=u `find . -print`
-       (VER=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`; \
-               echo "==> Making $(TOOL)-$$VER.tar.gz"; \
-               rm -f $(TOOL)-$$VER; ln -s proto-toplev $(TOOL)-$$VER; \
-               tar cfh - $(TOOL)-$$VER \
-               | $(GZIPPROG) -v -9 >$(TOOL)-$$VER.tar.gz )
+       $(MAKE) -f Makefile.in do-tar-gz TOOL=$(TOOL) \
+               VER=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`
+
+do-tar-gz:
+       echo "==> Making $(TOOL)-$(VER).tar.gz"
+       -rm -f $(TOOL)-$(VER)
+       ln -s proto-toplev $(TOOL)-$(VER)
+       tar cfh $(TOOL)-$(VER).tar $(TOOL)-$(VER)
+       $(GZIPPROG) -v -9 $(TOOL)-$(VER).tar
 
 TEXINFO_SUPPORT= texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo
 DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)
 
 .PHONY: gas.tar.gz
-GAS_SUPPORT_DIRS= bfd include libiberty opcodes
+GAS_SUPPORT_DIRS= bfd include libiberty opcodes make-all.com setup.com
 gas.tar.gz: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
        $(MAKE) -f Makefile.in taz TOOL=gas \
                SUPPORT_FILES="$(GAS_SUPPORT_DIRS)"
 
 # The FSF "binutils" release includes gprof and ld.
 .PHONY: binutils.tar.gz
-BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof
+BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof make-all.com setup.com
 binutils.tar.gz: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils
        $(MAKE) -f Makefile.in taz TOOL=binutils \
                SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS) makeall.bat configure.bat"