diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2014-01-30 21:25:01 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2014-01-30 21:25:01 +0000 |
| commit | 6adfbbbf16186d2fca99d04342a2ab53f6bb2354 (patch) | |
| tree | 2e75a9fbb61ae92c9216c3d8137c5ef713d97368 /usr.sbin/nmtree | |
| parent | 38e233371c34a7ffe3bbb1ffd6c1d3f3d0479681 (diff) | |
| download | src-test-6adfbbbf16186d2fca99d04342a2ab53f6bb2354.tar.gz src-test-6adfbbbf16186d2fca99d04342a2ab53f6bb2354.zip | |
Merge from CheriBSD:
commit 6b569451b92c48ccf1768da32e7e89189e1aa253
Author: Brooks Davis <brooks@one-eyed-alien.net>
Date: Mon Jan 27 22:50:46 2014 +0000
Always install nmtree as mtree.
For compability, link mtree to nmtree.
X-MFC after: never
Sponsored by: DARPA, AFRL
Notes
Notes:
svn path=/head/; revision=261297
Diffstat (limited to 'usr.sbin/nmtree')
| -rw-r--r-- | usr.sbin/nmtree/Makefile | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile index 138e28daf5ec2..f5c38b590f3cb 100644 --- a/usr.sbin/nmtree/Makefile +++ b/usr.sbin/nmtree/Makefile @@ -4,8 +4,8 @@ .PATH: ${.CURDIR}/../../contrib/mtree -PROG= nmtree -MAN= nmtree.8 +PROG= mtree +MAN= mtree.8 SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \ only.c spec.c specspec.c verify.c LDADD+= -lmd -lutil @@ -20,14 +20,7 @@ LIBNETBSD= ${LIBNETBSDDIR}/libnetbsd.a DPADD+= ${LIBNETBSD} LDADD+= ${LIBNETBSD} -.if ${MK_NMTREE} != "no" -LINKS= ${BINDIR}/nmtree ${BINDIR}/mtree -MLINKS= nmtree.8 mtree.8 -.endif - -CLEANFILES+= nmtree.8 - -nmtree.8: mtree.8 - cp ${.ALLSRC} ${.TARGET} +LINKS= ${BINDIR}/mtree ${BINDIR}/nmtree +MLINKS= mtree.8 nmtree.8 .include <bsd.prog.mk> |