From 44dde923fc87d6a6ff58edd30943412978b6fb10 Mon Sep 17 00:00:00 2001
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Thu, 24 Jul 2003 07:42:42 +0000
Subject: [PATCH] Fix rescue build using -j. The problem appears to be make not
 being able to find the source when the object was specified as
 <directory>/foo.o.

The fix makes the build go through a make objs before compiling the rest
of the crunchgen. This ensures that the dhclient bits are built in the
correct place where they are picked up for the final compile of rescue.

I'd like to thank dwhite@ and gad@ for helping me track down the problem.

Fast testing box provided by:	phk@ (thanks)
---
 rescue/rescue/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 5f532d31a873..d12c35caa8e1 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -246,14 +246,15 @@ $(CONF): Makefile
 .endfor
 
 
+.ORDER: $(OUTPUTS) objs
 $(OUTPUTS): $(CONF)
 	MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -q -m $(OUTMK) -c $(OUTC) \
 	    $(CONF)
 
-$(PROG): $(OUTPUTS)
+$(PROG): $(OUTPUTS) objs
 	MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK) 
 
-objs:
+objs: $(OUTMK)
 	MAKEOBJDIRPREFIX=${CRUNCHOBJS} make -f $(OUTMK) objs
 
 # <sigh> Someone should replace the bin/csh and bin/sh build-tools with