Mon Jan 11 18:32:22 1993 Ian Lance Taylor (ian@tweedledumb.cygnus.com)

[deliverable/binutils-gdb.git] / test-build.mk

diff --git a/test-build.mk b/test-build.mk
index 109203d7446fd925f5e5766690dd797f08268e13..40894dd96dab18b976892d19358b4e0544de68ef 100644 (file)
--- a/test-build.mk
+++ b/test-build.mk
@@ -43,7 +43,7 @@ CVS_TAG :=
 CVS_MODULE := latest
 
 ### Historically, this was identical to CVS_TAG.  This is changing.
-RELEASE_TAG := latest-921118
+RELEASE_TAG := latest-921229
 
 ### Historically, binaries were installed here.  This is changing.
 release_root := $(ROOTING)/$(RELEASE_TAG)
@@ -71,7 +71,7 @@ FLAGS_TO_PASS := \
        "host=$(host)"
 
 
-prefixes       = -prefix=$(release_root) -exec_prefix=$(release_root)/H-$(host)
+prefixes       = -prefix=$(release_root) -exec-prefix=$(release_root)/H-$(host)
 relbindir      = $(release_root)/H-$(host)/bin
 
 
@@ -280,6 +280,9 @@ $(host)-stamp-stage1:
 $(host)-stamp-stage1-installed: $(host)-stamp-stage1-checked
        cd $(WORKING_DIR) ; $(TIME) $(MAKE) $(MF) "CFLAGS=$(CFLAGS)" install host=$(host)
        cd $(WORKING_DIR) ; $(TIME) $(MAKE) $(MF) "CFLAGS=$(CFLAGS)" install-info host=$(host)
+ifeq ($(host),rs6000-ibm-aix)
+       rm $(relbindir)/make
+endif
        touch $@
 
 $(host)-stamp-stage1-checked: $(host)-stamp-stage1-built
@@ -427,6 +430,7 @@ endif
 
 ### solaris 2 -- don't use /usr/ucb/cc
 ifeq (sparc-sun-solaris2,$(host))
+PARTIAL_HOLE_DIRS := /opt/cygnus/bin
 CC_HOLE        := cc
 else
 CC_HOLE :=
@@ -449,6 +453,7 @@ PARTIAL_HOLES := \
 
 ### look in these directories for things missing from a three-stage
 HOLE_DIRS := \
+       $(HOLE_DIRS) \
        /bin \
        /usr/bin \
        /usr/ucb \
@@ -459,7 +464,7 @@ HOLE_DIRS := \
 PARTIAL_HOLE_DIRS := \
        /usr/latest/bin \
        /usr/progressive/bin \
-       /opt/cygnus/bin \
+       $(PARTIAL_HOLE_DIRS) \
        /usr/vintage/bin \
        /usr/unsupported/bin
 
@@ -472,7 +477,7 @@ $(host)-stamp-holes:
                found= ; \
                for j in $(HOLE_DIRS) ; do \
                        if [ -x $$j/$$i ] ; then \
-                               cp $$j/$$i $(HOLESDIR) ; \
+                               ln -s $$j/$$i $(HOLESDIR) || cp $$j/$$i $(HOLESDIR) ; \
                                echo $$i from $$j ; \
                                found=t ; \
                                break ; \
@@ -506,7 +511,7 @@ comparison: $(host)-stamp-3stage-compared
 
 $(host)-stamp-3stage-compared:
        rm -f .bad-compare
-ifeq ($(subst rs6000-ibm-aix,mips-sgi-irix4,$(subst mips-dec-ultrix,mips-sgi-irix4,$(host))),mips-sgi-irix4)
+ifeq ($(subst i386-sco3.2v4,mips-sgi-irix4,$(subst rs6000-ibm-aix,mips-sgi-irix4,$(subst mips-dec-ultrix,mips-sgi-irix4,$(host)))),mips-sgi-irix4)
        for i in `cd $(STAGE3DIR) ; find . -name \*.o -print` ; do \
                tail +10c $(STAGE2DIR)/$$i > foo1 ; \
                tail +10c $(STAGE3DIR)/$$i > foo2 ; \
@@ -532,6 +537,7 @@ endif
            else \
              rm -rf $(STAGE1DIR) $(STAGE2DIR) ; \
            fi ; \
+         else true ; \
          fi ; \
        fi
        touch $@