From fb682d6970089e99071239fa4a0b6c2a66333652 Mon Sep 17 00:00:00 2001
From: Mark Eichin <eichin@cygnus>
Date: Tue, 9 Nov 1993 23:32:04 +0000
Subject: [PATCH] don't ever use sh explicitly for lynxos, set SHELL=/bin/bash

---
 build-all.mk  |  5 ++++-
 test-build.mk | 16 +++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/build-all.mk b/build-all.mk
index 5fda258..1b0fe90 100644
--- a/build-all.mk
+++ b/build-all.mk
@@ -181,12 +181,14 @@ ifeq ($(canonhost),i386-lynxos)
 TARGETS = $(NATIVE)
 CC = /bin/gcc
 all: all-cygnus
+SHELL=/bin/bash
 endif
 
 ifeq ($(canonhost),m68k-lynxos)
 TARGETS = $(NATIVE)
 CC = /bin/gcc
 all: all-cygnus
+SHELL=/bin/bash
 endif
 
 
@@ -197,7 +199,8 @@ FLAGS_TO_PASS := \
 	"CXXFLAGS=$(CXXFLAGS)" \
 	"host=$(canonhost)" \
 	"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
-	"RELEASE_TAG=$(RELEASE_TAG)"
+	"RELEASE_TAG=$(RELEASE_TAG)" \
+	"SHELL=$(SHELL)"
 
 all-emacs:
 	@echo build started at `date`
diff --git a/test-build.mk b/test-build.mk
index d7aaf49..e72243f 100644
--- a/test-build.mk
+++ b/test-build.mk
@@ -118,6 +118,7 @@ FLAGS_TO_PASS := \
 	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
 	"RELEASE_TAG=$(RELEASE_TAG)" \
 	"RUNTEST=$(relbindir)/runtest" \
+	"SHELL=$(SHELL)" \
 	"TIME=$(TIME)" \
 	"YACC=$(YACC)" \
 	"build=$(build)" \
@@ -138,6 +139,7 @@ FLAGS_TO_PASS := \
 	"TIME=$(TIME)" \
 	"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
 	"MF=$(MF)" \
+	"SHELL=$(SHELL)" \
 	"host=$(host)" \
 	"RELEASE_TAG=$(RELEASE_TAG)"
 
@@ -195,9 +197,9 @@ HOLESDIR 	:= $(holesys)-holes
 BUILD_HOST_HOLES_DIR	:= $(build)-x-$(host)-holes
 BUILD_TARGET_HOLES_DIR	:= $(build)-x-$(target)-holes
 
-SET_NATIVE_HOLES := SHELL=sh ; PATH=`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
-SET_CYGNUS_PATH  := SHELL=sh ; PATH=`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
-SET_LATEST_PATH  := SHELL=sh ; PATH=/usr/latest/bin:`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
+SET_NATIVE_HOLES := SHELL=$(SHELL) ; PATH=`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
+SET_CYGNUS_PATH  := SHELL=$(SHELL) ; PATH=`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
+SET_LATEST_PATH  := SHELL=$(SHELL) ; PATH=/usr/latest/bin:`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
 
 else
 
@@ -205,9 +207,9 @@ holesys		:= $(host)
 HOLESSTAMP	:= $(holesys)-stamp-holes
 HOLESDIR 	:= $(holesys)-holes
 
-SET_NATIVE_HOLES := SHELL=sh ; PATH=`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
-SET_CYGNUS_PATH  := SHELL=sh ; PATH=$(relbindir):`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
-SET_LATEST_PATH  := SHELL=sh ; PATH=/usr/latest/bin:`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
+SET_NATIVE_HOLES := SHELL=$(SHELL) ; PATH=`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
+SET_CYGNUS_PATH  := SHELL=$(SHELL) ; PATH=$(relbindir):`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
+SET_LATEST_PATH  := SHELL=$(SHELL) ; PATH=/usr/latest/bin:`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
 
 endif
 
@@ -679,7 +681,7 @@ endif
 
 ### solaris 2 -- don't use /usr/ucb/cc
 ifeq (sparc-sun-solaris2,$(holesys))
-SET_NATIVE_HOLES := SHELL=sh ; PATH=/opt/SUNWspro/bin:`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
+SET_NATIVE_HOLES := SHELL=$(SHELL) ; PATH=/opt/SUNWspro/bin:`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
 HOLE_DIRS := /usr/ccs/bin
 CC_HOLE :=
 NUKEM := cc 
-- 
2.7.4