Date: Sat, 19 May 2012 18:05:01 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r235655 - in head: bin/ls share/mk Message-ID: <201205191805.q4JI513M037128@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Sat May 19 18:05:00 2012 New Revision: 235655 URL: http://svn.freebsd.org/changeset/base/235655 Log: Add build opton MK_LS_COLORS to control whether ls(1) supports colors (and thus needs to depend on libtermcap). Embedded systems may not want or need colors. Obtained from: Juniper Networks, Inc. Modified: head/bin/ls/Makefile head/share/mk/bsd.own.mk Modified: head/bin/ls/Makefile ============================================================================== --- head/bin/ls/Makefile Sat May 19 17:55:49 2012 (r235654) +++ head/bin/ls/Makefile Sat May 19 18:05:00 2012 (r235655) @@ -1,12 +1,15 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 # $FreeBSD$ +.include <bsd.own.mk> + PROG= ls SRCS= cmp.c ls.c print.c util.c DPADD= ${LIBUTIL} LDADD= -lutil -.if !defined(RELEASE_CRUNCH) +.if !defined(RELEASE_CRUNCH) && \ + ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS DPADD+= ${LIBTERMCAP} LDADD+= -ltermcap Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Sat May 19 17:55:49 2012 (r235654) +++ head/share/mk/bsd.own.mk Sat May 19 18:05:00 2012 (r235655) @@ -367,6 +367,7 @@ __DEFAULT_YES_OPTIONS = \ LOCALES \ LOCATE \ LPR \ + LS_COLORS \ MAIL \ MAILWRAPPER \ MAKE \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205191805.q4JI513M037128>