* ldlang.c (lang_reasonable_defaults): Remove.

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

diff --git a/Makefile.tpl b/Makefile.tpl
index d85d0902f76111695f2d7d3d57fb5f7762553001..597cb80e88a2fc8b7968b28d51668bb1b105c963 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -201,7 +201,7 @@ BASE_TARGET_EXPORTS = \
        CC="$(CC_FOR_TARGET)"; export CC; \
        CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-       CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+       CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
        CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
        GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
        GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
@@ -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} \