diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2018-11-04 15:49:06 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2018-11-04 15:49:06 +0000 |
| commit | 2a22df74e9fceaffd62ee437de08383d6cf8cfe0 (patch) | |
| tree | d4887f0719a9a8b98c787012703fa65e21554dc8 /etc | |
| parent | 689486003b2d4637b61b61d5a30bf98fb11ddc16 (diff) | |
| parent | 6d080f8660b370f83eb10a840b6d14b6dd84a1de (diff) | |
Notes
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 60 | ||||
| -rw-r--r-- | etc/mtree/BSD.tests.dist | 8 | ||||
| -rw-r--r-- | etc/nls.alias | 4 |
3 files changed, 35 insertions, 37 deletions
diff --git a/etc/Makefile b/etc/Makefile index df8f99e4c3de..4714b580cc82 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -4,6 +4,8 @@ .include <src.opts.mk> FILESGROUPS= FILES +NLS_ALIASES= POSIX C \ + en_US.US_ASCII C # No need as it is empty and just causes rebuilds since this file does so much. UPDATE_DEPENDFILE= no @@ -157,42 +159,34 @@ 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`; \ - while [ $$# -gt 0 ] ; do \ - ${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/nls/$$1"; \ - shift; shift; \ - done +.for alias nls in ${NLS_ALIASES} + ${INSTALL_SYMLINK} "${nls}" "${DESTDIR}${SHAREDIR}/nls/${alias}" +.endfor .endif etc-examples: ${META_DEPS} diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 24bad91a0fdf..7da2d745b1af 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -270,6 +270,14 @@ test-programs .. .. + csu + dynamic + .. + dynamiclib + .. + static + .. + .. libarchive .. libc diff --git a/etc/nls.alias b/etc/nls.alias deleted file mode 100644 index 805c34ab6b8a..000000000000 --- a/etc/nls.alias +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD$ - -POSIX C -en_US.US-ASCII C |