From 5d280640cdf5a9d6c9e2ab96b3eefbc18b16be33 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Mon, 3 Jun 2019 15:12:44 +0000 Subject: [PATCH] Leave mtree hardcoded for now. Reverting partially 348521 and also the followup stopgap change, because I don't think it's a correct. I still need to figure out where to stick it in. In cannot be in Makefile.inc1 and it cannot be in etc/Makefile from the looks of it to avoid chicken-and-egg problem. --- Makefile.inc1 | 2 +- etc/Makefile | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 60ac6493c955..3e984e16f9ba 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -888,7 +888,7 @@ INSTALLFLAGS+= -h sha256 .endif .if defined(DB_FROM_SRC) || defined(NO_ROOT) IMAKE_INSTALL= INSTALL="${INSTALL} ${INSTALLFLAGS}" -IMAKE_MTREE= MTREE_CMD="${MTREE} ${MTREEFLAGS}" +IMAKE_MTREE= MTREE_CMD="mtree ${MTREEFLAGS}" .endif DESTDIR_MTREEFLAGS= -deU diff --git a/etc/Makefile b/etc/Makefile index 7ee9eca7eb18..f8360b969d22 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -93,8 +93,6 @@ distribution: .endif .endif -MTREE_CMD?= mtree - MTREES= mtree/BSD.root.dist / \ mtree/BSD.var.dist /var \ mtree/BSD.usr.dist /usr \