From b43b9385930f29388d4f4028a302475adf4f9ff3 Mon Sep 17 00:00:00 2001
From: simonm <unknown>
Date: Tue, 7 Oct 1997 15:14:04 +0000
Subject: [PATCH] [project @ 1997-10-07 15:14:04 by simonm] - do
 $(SCRIPT_SUBST) properly for shell scripts. - don't bomb
 out if the rmdir fails when cleaning split_objs
 directories.

---
 mk/target.mk |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mk/target.mk b/mk/target.mk
index 8117ba6..d325755 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -374,7 +374,11 @@ ifneq "$(SCRIPT_PROG)" ""
 #
 # ToDo: make this work for shell scripts (drop the initial $).
 #
+ifeq "$(INTERP)" "$(SHELL)"
+SCRIPT_SUBST=$(foreach val,$(SCRIPT_SUBST_VARS),"echo \"$(val)=\\\"$($(val))\\\";\" >> $@;")
+else
 SCRIPT_SUBST=$(foreach val,$(SCRIPT_SUBST_VARS),"echo \"$$\"\"$(val)=\\\"$($(val))\\\";\" >> $@;")
+endif
 
 all :: $(SCRIPT_PROG)
 
@@ -911,7 +915,7 @@ ifneq "$(HS_OBJS)" ""
 ifneq "$(filter -split-objs,$(HC_OPTS))" ""
 clean ::
 	find $(patsubst %.$(way_)o,%,$(HS_OBJS)) -name '*.$(way_)o' -print | xargs $(RM) __rm_food
-	rmdir $(patsubst %.$(way_)o,%,$(HS_OBJS))
+	-rmdir $(patsubst %.$(way_)o,%,$(HS_OBJS))
 endif
 endif
 
-- 
1.7.10.4