Simplify a bit distrib-dirs target
Reviewed by: bdrewery Differential Revision: https://reviews.freebsd.org/D3915
This commit is contained in:
parent
56b187fca8
commit
97dc79f29a
50
etc/Makefile
50
etc/Makefile
@ -157,35 +157,29 @@ distrib-cleanup: .PHONY
|
||||
done
|
||||
|
||||
distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
|
||||
@set ${MTREES}; \
|
||||
while test $$# -ge 2; do \
|
||||
m=${.CURDIR}/$$1; \
|
||||
shift; \
|
||||
d=${DESTDIR}$$1; \
|
||||
shift; \
|
||||
test -d $$d || mkdir -p $$d; \
|
||||
${ECHO} ${MTREE_CMD} -deU ${MTREE_FSCHG} \
|
||||
${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
|
||||
${MTREE_FILTER} $$m | \
|
||||
${MTREE_CMD} -deU ${MTREE_FSCHG} ${MTREE_FOLLOWS_SYMLINKS} \
|
||||
-p $$d; \
|
||||
done; true
|
||||
.for _m _d in ${MTREES}
|
||||
@m=${.CURDIR}/${_m}; \
|
||||
d=${DESTDIR}${_d}; \
|
||||
test -d $$d || mkdir -p $$d; \
|
||||
${ECHO} ${MTREE_CMD} -deU ${MTREE_FSCHG} \
|
||||
${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
|
||||
${MTREE_FILTER} $$m | \
|
||||
${MTREE_CMD} -deU ${MTREE_FSCHG} ${MTREE_FOLLOWS_SYMLINKS} \
|
||||
-p $$d; \
|
||||
.endfor
|
||||
.if defined(NO_ROOT)
|
||||
@set ${MTREES}; \
|
||||
while test $$# -ge 2; do \
|
||||
m=${.CURDIR}/$$1; \
|
||||
shift; \
|
||||
d=$$1; \
|
||||
test "$$d" == "/" && d=""; \
|
||||
d=${DISTBASE}$$d; \
|
||||
shift; \
|
||||
test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \
|
||||
${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K all | " \
|
||||
"sed s#^\.#.$$d# | ${METALOG.add}" ; \
|
||||
${MTREE_FILTER} $$m | \
|
||||
${MTREE_CMD:N-W} -C -K all | sed s#^\.#.$$d# | \
|
||||
${METALOG.add} ; \
|
||||
done; true
|
||||
.for _m _d in ${MTREES}
|
||||
@m=${.CURDIR}/${_m}; \
|
||||
d=${_d}; \
|
||||
test "$$d" == "/" && d=""; \
|
||||
d=${DISTBASE}$$d; \
|
||||
test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \
|
||||
${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K all | " \
|
||||
"sed s#^\.#.$$d# | ${METALOG.add}" ; \
|
||||
${MTREE_FILTER} $$m | \
|
||||
${MTREE_CMD:N-W} -C -K all | sed s#^\.#.$$d# | \
|
||||
${METALOG.add} ; \
|
||||
.endfor
|
||||
.endif
|
||||
.if ${MK_NLS} != "no"
|
||||
set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
|
||||
|
Loading…
Reference in New Issue
Block a user