aboutsummaryrefslogtreecommitdiff
path: root/Makefile.tpl
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2005-01-03 14:02:25 +0000
committerPaolo Bonzini <bonzini@gnu.org>2005-01-03 14:02:25 +0000
commitc50382e27e86d9e57a32a61f5f6c0a5bde8367a1 (patch)
tree17b181ddfde9744530db39fa0d043ff304ad3212 /Makefile.tpl
parent57a2933e7204a52b4885f91f28857ae82db8287e (diff)
downloadgdb-c50382e27e86d9e57a32a61f5f6c0a5bde8367a1.zip
gdb-c50382e27e86d9e57a32a61f5f6c0a5bde8367a1.tar.gz
gdb-c50382e27e86d9e57a32a61f5f6c0a5bde8367a1.tar.bz2
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.
Diffstat (limited to 'Makefile.tpl')
-rw-r--r--Makefile.tpl74
1 files changed, 38 insertions, 36 deletions
diff --git a/Makefile.tpl b/Makefile.tpl
index d85d090..44c15fd 100644
--- a/Makefile.tpl
+++ b/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} \