2005-01-03 Paolo Bonzini <bonzini@gnu.org>

	Revert 2004-12-28 Makefile changes, a better fix will be
	applied to mainline and src after GCC 4.0 branches.

From-SVN: r92826

ChangeLog

+2005-01-03  Paolo Bonzini  <bonzini@gnu.org>
+
+	Revert 2004-12-28 Makefile changes, a better fix will be
+	applied to mainline and src after GCC 4.0 branches.
+
 2004-12-28  Paolo Bonzini  <bonzini@gnu.org>
 
 	PR bootstrap/17383

Makefile.def

@@ -117,7 +117,7 @@ target_modules = { module= libmudflap; };
 target_modules = { module= newlib; };
 target_modules = { module= libgfortran; };
 target_modules = { module= libobjc; };
-target_modules = { module= libtermcap; no_check=true;
+target_modules = { module= libtermcap; no_check=true; stage=true;
                    missing=mostlyclean;
                    missing=clean;
                    missing=distclean;
@@ -129,7 +129,7 @@ target_modules = { module= gperf; };
 target_modules = { module= examples; no_check=true; no_install=true; };
 target_modules = { module= libffi; };
 target_modules = { module= libjava; raw_cxx=true; };
-target_modules = { module= zlib; };
+target_modules = { module= zlib; stage=true; };
 target_modules = { module= boehm-gc; };
 target_modules = { module= qthreads; };
 target_modules = { module= rda; };

Makefile.tpl

@@ -822,30 +822,31 @@ configure-build-[+module+]:
 	echo Configuring in $(BUILD_SUBDIR)/[+module+]; \
 	cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \
 	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir="../../$(srcdir)" ;; \
+	  /* | [A-Za-z]:[\\/]*) \
+	    topdir=$(srcdir) ;; \
+	  *) \
+	    case "$(BUILD_SUBDIR)" in \
+	      .) topdir="../$(srcdir)" ;; \
+	      *) topdir="../../$(srcdir)" ;; \
+	    esac ;; \
 	esac; \
 	if [ "$(srcdir)" = "." ] ; then \
-	  if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
-	    if [ -f Makefile ]; then \
-	      if $(MAKE) distclean; then \
-	        true; \
+	  if [ "$(BUILD_SUBDIR)" != "." ] ; then \
+	    if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
+	      if [ -f Makefile ]; then \
+	        if $(MAKE) distclean; then \
+	          true; \
+	        else \
+	          exit 1; \
+	        fi; \
 	      else \
-	        exit 1; \
+	        true; \
 	      fi; \
 	    else \
-	      true; \
+	      exit 1; \
 	    fi; \
 	  else \
-	    exit 1; \
-	  fi; \
-	  if [ -d ../include ] ; then \
 	    true; \
-	  else \
-	    mkdir ../include; \
-	    cd ../include; \
-	    $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \
-	    cd ../[+module+]; \
 	  fi; \
 	  srcdiroption="--srcdir=."; \
 	  libsrcdir="."; \
@@ -1031,37 +1032,38 @@ ENDIF raw_cxx +]
 	echo Configuring in $(TARGET_SUBDIR)/[+module+]; \
 	cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \
 	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir="../../$(srcdir)" ;; \
-	esac; \
+	  /* | [A-Za-z]:[\\/]*) \
+	    topdir=$(srcdir) ;; \
+	  *) \
+	    case "$(TARGET_SUBDIR)" in \
+	      .) topdir="../$(srcdir)" ;; \
+	      *) topdir="../../$(srcdir)" ;; \
+	    esac ;; \
+	esac; \[+ IF stage +]
 	if [ "$(srcdir)" = "." ] ; then \
-	  if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
-	    if [ -f Makefile ]; then \
-	      if $(MAKE) distclean; then \
-	        true; \
+	  if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+	    if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
+	      if [ -f Makefile ]; then \
+	        if $(MAKE) distclean; then \
+	          true; \
+	        else \
+	          exit 1; \
+	        fi; \
 	      else \
-	        exit 1; \
+	        true; \
 	      fi; \
 	    else \
-	      true; \
+	      exit 1; \
 	    fi; \
 	  else \
-	    exit 1; \
-	  fi; \
-	  if [ -d ../include ] ; then \
 	    true; \
-	  else \
-	    mkdir ../include; \
-	    cd ../include; \
-	    $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \
-	    cd ../[+module+]; \
 	  fi; \
 	  srcdiroption="--srcdir=."; \
 	  libsrcdir="."; \
-	else \
+	else \[+ ENDIF stage +]
 	  srcdiroption="--srcdir=$${topdir}/[+module+]"; \
-	  libsrcdir="$$s/[+module+]"; \
-	fi; \
+	  libsrcdir="$$s/[+module+]"; \[+ IF stage +]
+	fi; \[+ ENDIF stage +]
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
 	  $(TARGET_CONFIGARGS) $${srcdiroption} \