View | Details | Raw Unified | Return to bug 110348
Collapse All | Expand All

(-)bin/ls/Makefile (+4 lines)
Lines 6-11 Link Here
6
DPADD=	${LIBUTIL}
6
DPADD=	${LIBUTIL}
7
LDADD=	-lutil
7
LDADD=	-lutil
8
8
9
.if defined(NO_LSAUTODOT)
10
CFLAGS+= -DNO_LSAUTODOT
11
.endif
12
9
.if !defined(RELEASE_CRUNCH)
13
.if !defined(RELEASE_CRUNCH)
10
CFLAGS+= -DCOLORLS
14
CFLAGS+= -DCOLORLS
11
DPADD+=	${LIBTERMCAP}
15
DPADD+=	${LIBTERMCAP}
(-)bin/ls/ls.c (+2 lines)
Lines 338-345 Link Here
338
	argv += optind;
338
	argv += optind;
339
339
340
	/* Root is -A automatically unless -I. */
340
	/* Root is -A automatically unless -I. */
341
#ifndef NO_LSAUTODOT
341
	if (!f_listdot && getuid() == (uid_t)0 && !f_noautodot)
342
	if (!f_listdot && getuid() == (uid_t)0 && !f_noautodot)
342
		f_listdot = 1;
343
		f_listdot = 1;
344
#endif
343
345
344
	/* Enabling of colours is conditional on the environment. */
346
	/* Enabling of colours is conditional on the environment. */
345
	if (getenv("CLICOLOR") &&
347
	if (getenv("CLICOLOR") &&
(-)share/examples/etc/make.conf (+1 lines)
Lines 106-111 Link Here
106
#NO_MODULES=		# do not build modules with the kernel
106
#NO_MODULES=		# do not build modules with the kernel
107
#NO_SHARE=		# do not go into the share subdir
107
#NO_SHARE=		# do not go into the share subdir
108
#NO_SHARED= 		# build /bin and /sbin statically linked (bad idea)
108
#NO_SHARED= 		# build /bin and /sbin statically linked (bad idea)
109
#NO_LSAUTODOT=		# do not automatically enable -A for root on /bin/ls
109
#
110
#
110
# Variables that control how ppp(8) is built.
111
# Variables that control how ppp(8) is built.
111
#PPP_NO_NAT= 		# do not build with NAT support (see make.conf(5))
112
#PPP_NO_NAT= 		# do not build with NAT support (see make.conf(5))

Return to bug 110348