From bf7d1c05f3a4dcd10736f3d86621c105db25207d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= <ftigeot@wolfpond.org>
Date: Tue, 8 Apr 2014 21:10:33 +0200
Subject: [PATCH] bsd.crunchgen.mk: Change paths

This file is intended to be used from src/share/initrd/
and not src/rescue/ like on FreeBSD.
---
 share/mk/bsd.crunchgen.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/mk/bsd.crunchgen.mk b/share/mk/bsd.crunchgen.mk
index 9832881ca0..8d461030c2 100644
--- a/share/mk/bsd.crunchgen.mk
+++ b/share/mk/bsd.crunchgen.mk
@@ -57,7 +57,7 @@ NO_DEBUG_FILES=
 .ifdef CRUNCH_SRCDIR_${P}
 $(OUTPUTS): $(CRUNCH_SRCDIR_${P})/Makefile
 .else
-$(OUTPUTS): $(.CURDIR)/../../$(D)/$(P)/Makefile
+$(OUTPUTS): $(.CURDIR)/../../../$(D)/$(P)/Makefile
 .endif
 .if ${CRUNCH_GENERATE_LINKS} == "yes"
 .ifndef CRUNCH_SUPPRESS_LINK_${P}
@@ -92,7 +92,7 @@ $(CONF): Makefile
 .ifdef CRUNCH_SRCDIR_${P}
 	echo special $(P) srcdir $(CRUNCH_SRCDIR_${P}) >>$(.TARGET)
 .else
-	echo special $(P) srcdir $(.CURDIR)/../../$(D)/$(P) >>$(.TARGET)
+	echo special $(P) srcdir $(.CURDIR)/../../../$(D)/$(P) >>$(.TARGET)
 .endif
 .ifdef CRUNCH_BUILDOPTS_${P}
 	echo special $(P) buildopts DIRPRFX=${DIRPRFX}${P}/ \
@@ -123,7 +123,7 @@ objs: $(OUTMK)
 # shell scripts so we can remove this nonsense.
 build-tools:
 .for _tool in $(CRUNCH_BUILDTOOLS)
-	cd $(.CURDIR)/../../${_tool}; \
+	cd $(.CURDIR)/../../../${_tool}; \
 	MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} obj; \
 	MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} build-tools
 .endfor
@@ -140,7 +140,7 @@ cleandepend cleandir obj objlink:
 	    MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} \
 	    DIRPRFX=${DIRPRFX}${P}/ ${CRUNCH_BUILDOPTS} ${.TARGET}
 .else
-	cd $(.CURDIR)/../../${D}/${P} && \
+	cd $(.CURDIR)/../../../${D}/${P} && \
 	    MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} \
 	    DIRPRFX=${DIRPRFX}${P}/ ${CRUNCH_BUILDOPTS} ${.TARGET}
 .endif
@@ -159,7 +159,7 @@ clean:
 	    MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} \
 	    DIRPRFX=${DIRPRFX}${P}/ ${CRUNCH_BUILDOPTS} ${.TARGET}
 .else
-	cd $(.CURDIR)/../../${D}/${P} && \
+	cd $(.CURDIR)/../../../${D}/${P} && \
 	    MAKEOBJDIRPREFIX=${CANONICALOBJDIR} ${MAKE} \
 	    DIRPRFX=${DIRPRFX}${P}/ ${CRUNCH_BUILDOPTS} ${.TARGET}
 .endif
-- 
2.41.0