From ebb5895a82b8c8db90b35d1dac2c50ac4deb06c9 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Sun, 30 Jan 2005 23:04:33 +0000
Subject: [PATCH] Explicitly cd to the .OBJDIR in the  ${PROG}.strip  target.
 This fixes the "make -j N dependall" build issues people were seeing in
 src/rescue, that appears to have been introduced in rev 1.62.

Use the MAKEVERBOSE macros (if present) to print the pretty message.

Set the CRUNCH_VERSION to 20050130.
---
 usr.bin/crunch/crunchgen/crunchgen.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr.bin/crunch/crunchgen/crunchgen.c b/usr.bin/crunch/crunchgen/crunchgen.c
index 0987dd6ae9f9..0d937a5bc56f 100644
--- a/usr.bin/crunch/crunchgen/crunchgen.c
+++ b/usr.bin/crunch/crunchgen/crunchgen.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: crunchgen.c,v 1.64 2004/10/30 17:17:35 dsl Exp $	*/
+/*	$NetBSD: crunchgen.c,v 1.65 2005/01/30 23:04:33 lukem Exp $	*/
 /*
  * Copyright (c) 1994 University of Maryland
  * All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: crunchgen.c,v 1.64 2004/10/30 17:17:35 dsl Exp $");
+__RCSID("$NetBSD: crunchgen.c,v 1.65 2005/01/30 23:04:33 lukem Exp $");
 #endif
 
 #include <stdlib.h>
@@ -52,7 +52,7 @@ __RCSID("$NetBSD: crunchgen.c,v 1.64 2004/10/30 17:17:35 dsl Exp $");
 #include <sys/param.h>
 #include <sys/utsname.h>
 
-#define CRUNCH_VERSION	"0.4"
+#define CRUNCH_VERSION	"20050130"
 
 #define MAXLINELEN	16384
 #define MAXFIELDS 	 2048
@@ -952,7 +952,8 @@ top_makefile_rules(FILE *outmk)
     fprintf(outmk, "${PROG}.strip:\n");
     fprintf(outmk, "\t${MAKE} -f ${PROG}.mk ${PROG}\n");
     fprintf(outmk, "\t@[ -f ${PROG}.unstripped -a ! ${PROG} -nt ${PROG}.unstripped ] || { \\\n");
-    fprintf(outmk, "\t\techo stripping ${PROG}; \\\n");
+    fprintf(outmk, "\t\t${_MKSHMSG:Uecho} \"  strip \" ${PROG}; \\\n");
+    fprintf(outmk, "\t\tcd ${.OBJDIR} && \\\n");
     fprintf(outmk, "\t\tcp ${PROG} ${PROG}.unstripped && \\\n");
     fprintf(outmk, "\t\t${OBJCOPY} -S -R .note -R .ident -R .comment -R .copyright ${PROG} && \\\n");
     fprintf(outmk, "\t\ttouch ${PROG}.unstripped; \\\n");