summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosef Karthauser <joe@FreeBSD.org>2000-06-05 02:25:55 +0000
committerJosef Karthauser <joe@FreeBSD.org>2000-06-05 02:25:55 +0000
commit3ad254b3de1b1b218008cb3d693d76122ba3e8b7 (patch)
tree9b2b0344d3c0c8bfd32f3e514e462421ab2f426d
parent74985094ef1904f3bb16254005b0704f0c82d515 (diff)
Notes
-rw-r--r--bin/ls/Makefile2
-rw-r--r--release/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index 1607a4c4ada5..c20c8feb59f4 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -6,7 +6,9 @@ PROG= ls
SRCS= cmp.c setflags.c ls.c print.c util.c
.PATH: ${.CURDIR}/../../lib/libc/gen
+.if !defined(RELEASE_BUILD_FIXIT)
CFLAGS+= -DCOLORLS
LDADD= -lncurses
+.endif
.include <bsd.prog.mk>
diff --git a/release/Makefile b/release/Makefile
index d3c119e61f65..21decf86562f 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -355,6 +355,8 @@ release.3:
#
# NB: the "RELEASE_BUILD_FIXIT" magic prevents vi from including the
# Tcl and Perl APIs. See also /usr/src/usr.bin/vi/Makefile.
+# It also prevents ls linking against termcap by disabling color support.
+# See /usr/src/bin/ls/Makefile.
release.4:
@mkdir -p /stand
cp ${.CURDIR}/boot_crunch.conf.generic ${.OBJDIR}/boot_crunch.conf