Merge from CheriBSD:
commit 6b569451b9
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
This commit is contained in:
parent
38e233371c
commit
6adfbbbf16
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=261297
@ -749,16 +749,6 @@ Set to not build NLS catalogs.
|
|||||||
.\" from FreeBSD: head/tools/build/options/WITHOUT_NLS_CATALOGS 156932 2006-03-21 07:50:50Z ru
|
.\" from FreeBSD: head/tools/build/options/WITHOUT_NLS_CATALOGS 156932 2006-03-21 07:50:50Z ru
|
||||||
Set to not build NLS catalog support for
|
Set to not build NLS catalog support for
|
||||||
.Xr csh 1 .
|
.Xr csh 1 .
|
||||||
.It Va WITHOUT_NMTREE
|
|
||||||
.\" from FreeBSD: head/tools/build/options/WITHOUT_NMTREE 257138 2013-10-25 22:45:18Z brooks
|
|
||||||
Set to install
|
|
||||||
.Xr fmtree 8
|
|
||||||
as
|
|
||||||
.Xr mtree 8 .
|
|
||||||
By default
|
|
||||||
.Xr nmtree 8
|
|
||||||
is installed as
|
|
||||||
.Xr mtree 8 .
|
|
||||||
.It Va WITHOUT_NS_CACHING
|
.It Va WITHOUT_NS_CACHING
|
||||||
.\" from FreeBSD: head/tools/build/options/WITHOUT_NS_CACHING 172803 2007-10-19 14:01:25Z ru
|
.\" from FreeBSD: head/tools/build/options/WITHOUT_NS_CACHING 172803 2007-10-19 14:01:25Z ru
|
||||||
Set to disable name caching in the
|
Set to disable name caching in the
|
||||||
|
@ -321,7 +321,6 @@ __DEFAULT_YES_OPTIONS = \
|
|||||||
NIS \
|
NIS \
|
||||||
NLS \
|
NLS \
|
||||||
NLS_CATALOGS \
|
NLS_CATALOGS \
|
||||||
NMTREE \
|
|
||||||
NS_CACHING \
|
NS_CACHING \
|
||||||
NTP \
|
NTP \
|
||||||
OPENSSH \
|
OPENSSH \
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
.\" $FreeBSD$
|
|
||||||
Set to install
|
|
||||||
.Xr fmtree 8
|
|
||||||
as
|
|
||||||
.Xr mtree 8 .
|
|
||||||
By default
|
|
||||||
.Xr nmtree 8
|
|
||||||
is installed as
|
|
||||||
.Xr mtree 8 .
|
|
@ -14,11 +14,6 @@ CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256
|
|||||||
DPADD= ${LIBMD}
|
DPADD= ${LIBMD}
|
||||||
LDADD= -lmd
|
LDADD= -lmd
|
||||||
|
|
||||||
.if ${MK_NMTREE} == "no"
|
|
||||||
LINKS= ${BINDIR}/fmtree ${BINDIR}/mtree
|
|
||||||
MLINKS= fmtree.8 mtree.8
|
|
||||||
.endif
|
|
||||||
|
|
||||||
CLEANFILES+= fmtree.8
|
CLEANFILES+= fmtree.8
|
||||||
|
|
||||||
fmtree.8: mtree.8
|
fmtree.8: mtree.8
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
.PATH: ${.CURDIR}/../../contrib/mtree
|
.PATH: ${.CURDIR}/../../contrib/mtree
|
||||||
|
|
||||||
PROG= nmtree
|
PROG= mtree
|
||||||
MAN= nmtree.8
|
MAN= mtree.8
|
||||||
SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
|
SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
|
||||||
only.c spec.c specspec.c verify.c
|
only.c spec.c specspec.c verify.c
|
||||||
LDADD+= -lmd -lutil
|
LDADD+= -lmd -lutil
|
||||||
@ -20,14 +20,7 @@ LIBNETBSD= ${LIBNETBSDDIR}/libnetbsd.a
|
|||||||
DPADD+= ${LIBNETBSD}
|
DPADD+= ${LIBNETBSD}
|
||||||
LDADD+= ${LIBNETBSD}
|
LDADD+= ${LIBNETBSD}
|
||||||
|
|
||||||
.if ${MK_NMTREE} != "no"
|
LINKS= ${BINDIR}/mtree ${BINDIR}/nmtree
|
||||||
LINKS= ${BINDIR}/nmtree ${BINDIR}/mtree
|
MLINKS= mtree.8 nmtree.8
|
||||||
MLINKS= nmtree.8 mtree.8
|
|
||||||
.endif
|
|
||||||
|
|
||||||
CLEANFILES+= nmtree.8
|
|
||||||
|
|
||||||
nmtree.8: mtree.8
|
|
||||||
cp ${.ALLSRC} ${.TARGET}
|
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
Loading…
Reference in New Issue
Block a user