From 8b0bf216d636e6563fb99e85440ac2ea1ee2862e Mon Sep 17 00:00:00 2001
From: Colin Percival <cperciva@FreeBSD.org>
Date: Fri, 18 Mar 2005 12:55:07 +0000
Subject: [PATCH] Run "make obj" before "make build-tools" in the directories
 used for building the rescue binary.  This fixes a problem with NO_TCSH,
 where the "make obj" stage of buildworld doesn't recurse into bin/csh,
 resulting in csh build-tools being put into /usr/src/bin/csh.

Pointed out by:	dougb (on hackers@)
---
 rescue/rescue/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 24278d34ed50..3c26151f48d9 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -292,6 +292,7 @@ objs: $(OUTMK)
 build-tools:
 .for _tool in bin/csh bin/sh 
 	cd $(.CURDIR)/../../${_tool}; \
+	MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} obj; \
 	MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} build-tools
 .endfor