diff options
author | Warner Losh <imp@FreeBSD.org> | 2014-04-01 14:24:32 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2014-04-01 14:24:32 +0000 |
commit | 74b229cb2bed914e113660d088051be8efe9bbf0 (patch) | |
tree | de2a54e64530a80df2cb7e49a45cfb627458dfac | |
parent | 89cbdc859d80d034c1d9f0991a0a1dc0712d92d7 (diff) | |
download | src-74b229cb2bed914e113660d088051be8efe9bbf0.tar.gz src-74b229cb2bed914e113660d088051be8efe9bbf0.zip |
Don't test WITHOUT_FOO in program makefiles, test MK_FOO instead.
Notes
Notes:
svn path=/head/; revision=263997
-rw-r--r-- | share/mk/bsd.own.mk | 2 | ||||
-rw-r--r-- | usr.bin/grep/Makefile | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 24a0fcd53734..b463f094ad38 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -283,6 +283,7 @@ __DEFAULT_YES_OPTIONS = \ GCOV \ GDB \ GNU \ + GNU_GREP_COMPAT \ GPIB \ GPIO \ GPL_DTC \ @@ -310,6 +311,7 @@ __DEFAULT_YES_OPTIONS = \ LOCATE \ LPR \ LS_COLORS \ + LZMA_SUPPORT \ MAIL \ MAILWRAPPER \ MAKE \ diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile index 8b2fa0c49703..abc2f447073f 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 |