summaryrefslogtreecommitdiffstats
path: root/usr.bin/grep
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2014-04-01 14:24:32 +0000
committerimp <imp@FreeBSD.org>2014-04-01 14:24:32 +0000
commit1281eaa27c8e8a31c09ac3307f0cc77fd884aa1e (patch)
treede2a54e64530a80df2cb7e49a45cfb627458dfac /usr.bin/grep
parent8131bb3d73fd838ade81cbf836775d91da29ea87 (diff)
downloadFreeBSD-src-1281eaa27c8e8a31c09ac3307f0cc77fd884aa1e.zip
FreeBSD-src-1281eaa27c8e8a31c09ac3307f0cc77fd884aa1e.tar.gz
Don't test WITHOUT_FOO in program makefiles, test MK_FOO instead.
Diffstat (limited to 'usr.bin/grep')
-rw-r--r--usr.bin/grep/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile
index 8b2fa0c..abc2f44 100644
--- a/usr.bin/grep/Makefile
+++ b/usr.bin/grep/Makefile
@@ -43,7 +43,7 @@ MLINKS= grep.1 egrep.1 \
LDADD= -lz
DPADD= ${LIBZ}
-.if !defined(WITHOUT_LZMA_SUPPORT)
+.if ${MK_LZMA_SUPPORT} != "no"
LDADD+= -llzma
DPADD+= ${LIBLZMA}
@@ -57,7 +57,7 @@ LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \
CFLAGS+= -DWITHOUT_LZMA
.endif
-.if !defined(WITHOUT_BZIP2_SUPPORT)
+.if ${MK_BZIP2_SUPPORT} != "no"
LDADD+= -lbz2
DPADD+= ${LIBBZ2}
@@ -73,13 +73,13 @@ MLINKS+= grep.1 bzgrep.1 \
CFLAGS+= -DWITHOUT_BZIP2
.endif
-.if !defined(WITHOUT_GNU_COMPAT)
+.if ${MK_GNU_GREP_COMPAT} != "no"
CFLAGS+= -I${DESTDIR}/usr/include/gnu
LDADD+= -lgnuregex
DPADD+= ${LIBGNUREGEX}
.endif
-.if !defined(WITHOUT_NLS)
+.if ${MK_NLS} != "no"
.include "${.CURDIR}/nls/Makefile.inc"
.else
CFLAGS+= -DWITHOUT_NLS
OpenPOWER on IntegriCloud