Skip to content

Commit

Permalink
Leave mtree hardcoded for now. Reverting partially 348521 and also
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
sobomax authored and sobomax committed Jun 3, 2019
1 parent c5849a0 commit be37a4f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile.inc1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions etc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit be37a4f

Please sign in to comment.