more cleanup

2 files changed, 44 insertions, 18 deletions

diff --git a/build-all.mk b/build-all.mk
index 751f727..4f99380 100644
--- a/build-all.mk
+++ b/build-all.mk
@@ -37,7 +37,7 @@
 TREE	= devo
 include $(TREE)/release-info
 
-TEST_INSTALL_DISK = /galt
+TEST_INSTALL_DISK = /tug
 
 INSTALLDIR = $(TEST_INSTALL_DISK)/$(TREE)-test/$(RELEASE_TAG)
 
@@ -95,10 +95,10 @@ ifeq ($(canonhost),i386-unknown-sysv4.2)
 canonhost := i386-sysv4.2
 endif
 ifeq ($(canonhost),i386-lynx-lynxos)
-canonhost := i386-lynxos
+canonhost := i386-lynx
 endif
 ifeq ($(canonhost),m68k-lynx-lynxos)
-canonhost := m68k-lynxos
+canonhost := m68k-lynx
 endif
 
 ifeq ($(canonhost),sparc-sun-sunos4.1.3)
@@ -108,15 +108,14 @@ TARGETS = $(NATIVE) \
 	h8300-hms 	\
 	i386-aout	\
 	i386-lynx 	\
-	i386-netware 	\
-	i960-vxworks 	i960-intel-nindy \
+	i960-vxworks 	\
 	mips-idt-ecoff	\
 	m68k-aout	m68k-vxworks 	m68k-coff \
 	m68k-lynx 	\
 	sh-hms 		\
 	sparc-aout	sparc-vxworks	\
 	sparclite-aout  sparclite-vxworks \
-	z8k-coff
+	sparclite-coff  z8k-coff
 GCC = gcc -O -pipe
 all: all-cygnus
 endif
@@ -133,8 +132,8 @@ ifeq ($(canonhost),sparc-sun-solaris2)
 TARGETS = $(NATIVE) \
 	a29k-amd-udi \
 	i960-vxworks \
-	m68k-aout	m68k-coff \
-	m88k-coff	\
+	m68k-aout	m68k-coff 	m68k-vxworks \
+	m88k-coff     \
 	mipsel-idt-ecoff \
 	sparclite-aout
 CC = cc -Xs
@@ -210,21 +209,20 @@ CC = cc
 all: all-cygnus
 endif
 
-ifeq ($(canonhost),i386-lynxos)
+ifeq ($(canonhost),i386-lynx)
 TARGETS = $(NATIVE)
 CC = /bin/gcc
 all: all-cygnus
 SHELL=/bin/bash
 endif
 
-ifeq ($(canonhost),m68k-lynxos)
+ifeq ($(canonhost),m68k-lynx)
 TARGETS = $(NATIVE)
 CC = /bin/gcc
 all: all-cygnus
 SHELL=/bin/bash
 endif
 
-
 FLAGS_TO_PASS := \
 	"GCC=$(GCC)" \
 	"CC=$(CC)" \
@@ -333,6 +331,16 @@ all-cross:
 	       echo "     completed successfully" ; \
 	done
 
+do-dos:
+        $(MAKE) -f build-all.mk build=$(host) host=i386-go32 all-dos
+all-dos:
+        @for i in $(TARGETS) ; do \
+            echo "building $(canonhost) cross to $$i" ; \
+            $(MAKE) -f test-build.mk $(FLAGS_TO_PASS) host=$(host) target=$$i do-dos $
+(cyglog) && \
+               echo "     completed successfully at `date`" ; \
+        done
+
 config:
 	@for i in $(TARGETS) ; do \
 	  if [ "$$i" = "native" ] ; then \
diff --git a/test-build.mk b/test-build.mk
index 3cee9a7..1395fa0 100644
--- a/test-build.mk
+++ b/test-build.mk
@@ -56,6 +56,12 @@ ifndef target
 target := $(host)
 endif
 
+ifeq ($(patsubst %-lynx,lynx,$(host)),lynx)
+SHELL := /bin/bash
+GNU_MAKE := $(MAKE)
+CONFIG_SHELL 	:= /bin/bash
+endif
+
 ifneq ($(build),$(host))
 
 # We are building on a machine other than the host.  We rely upon
@@ -80,14 +86,15 @@ HOST_PREFIX	:= $(build)-
 HOST_PREFIX_1	:= $(build)-
 LEX		:= flex
 MAKEINFO	:= makeinfo
+MUNCH_NM	:= $(host)-nm
 NM		:= $(host)-nm
 NM_FOR_TARGET	:= $(target)-nm
 RANLIB		:= $(host)-ranlib
 RANLIB_FOR_TARGET	:= $(target)-ranlib
 YACC		:= $(BISON)
 
-ifeq ($(build),hppa1.1-hp-hpux)
-CC_FOR_BUILD	:= cc
+ifeq ($(host),i386-go32)
+MAKEINFOFLAGS = --no-split
 endif
 
 FLAGS_TO_PASS := \
@@ -110,6 +117,7 @@ FLAGS_TO_PASS := \
 	"MAKEINFO=$(MAKEINFO)" \
 	"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
 	"MF=$(MF)" \
+	"MUNCH_NM=$(MUNCH_NM)" \
 	"NM=$(NM)" \
 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
 	"RANLIB=$(RANLIB)" \
@@ -137,9 +145,9 @@ FLAGS_TO_PASS := \
 	"TIME=$(TIME)" \
 	"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
 	"MF=$(MF)" \
-	"SHELL=$(SHELL)" \
 	"host=$(host)" \
-	"RELEASE_TAG=$(RELEASE_TAG)"
+	"RELEASE_TAG=$(RELEASE_TAG)" \
+	"SHELL=$(SHELL)" 
 
 configenv :=
 
@@ -685,6 +693,7 @@ HOLES := \
 	rmdir \
 	sed \
 	sh \
+	sleep \
 	sort \
 	tar \
 	test \
@@ -717,6 +726,14 @@ ifeq ($(host),i386-go32)
 DOS_HOLES := aout2exe doschk file
 endif
 
+ifeq ($(host),i386-lynx)
+MAKE_HOLE := make
+endif
+
+ifeq ($(host),m68k-lynx)
+MAKE_HOLE := make
+endif
+
 ### These things are also needed by a three-stage, but in this case, the GNU version of the tool is required.
 PARTIAL_HOLES := \
 	$(MAKE_HOLE) \
@@ -739,7 +756,8 @@ PARTIAL_HOLE_DIRS := \
 	/usr/progressive/bin \
 	$(PARTIAL_HOLE_DIRS) \
 	/usr/vintage/bin \
-	/usr/unsupported/bin
+	/usr/unsupported/bin \
+	$(HOLE_DIRS)
 
 $(HOLESDIR): $(holesys)-stamp-holes
 
@@ -870,7 +888,7 @@ comparison-stage3to4: $(host)-stamp-4stage-compared
 
 $(host)-stamp-3stage-compared:
 	rm -f .bad-compare
-ifeq ($(patsubst %-lynxos,mips-sgi-irix4,$(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)
+ifeq ($(patsubst %-lynx,mips-sgi-irix4,$(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 ; \
@@ -903,7 +921,7 @@ endif
 
 $(host)-stamp-4stage-compared:
 	rm -f .bad-compare
-ifeq ($(patsubst %-lynxos,mips-sgi-irix4,$(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)
+ifeq ($(patsubst %-lynx,mips-sgi-irix4,$(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 $(STAGE4DIR) ; find . -name \*.o -print` ; do \
 		tail +10c $(STAGE3DIR)/$$i > foo1 ; \
 		tail +10c $(STAGE4DIR)/$$i > foo2 ; \