Fixes from (or inspired by) Bob Chassell editing pass for last

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

diff --git a/test-build.mk b/test-build.mk
index 77c9eb99b947a41fb6548ac5ca66c2978846ea17..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-921217
+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
 
 
@@ -477,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 ; \
@@ -511,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 ; \
@@ -537,6 +537,7 @@ endif
            else \
              rm -rf $(STAGE1DIR) $(STAGE2DIR) ; \
            fi ; \
+         else true ; \
          fi ; \
        fi
        touch $@