Page MenuHomeFreeBSD
Files F163057661

D11395.diff
No OneTemporary
Actions

D11395.diff
View Options

Index: usr.bin/grep/Makefile
===================================================================
--- usr.bin/grep/Makefile
+++ usr.bin/grep/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
# $OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $
-.include <src.opts.mk>
+.sinclude <src.opts.mk>
-.if ${MK_BSD_GREP} == "yes"
+.if defined(MK_BSD_GREP) && ${MK_BSD_GREP} == "yes"
PROG= grep
.else
PROG= bsdgrep
@@ -15,7 +15,7 @@
.endif
SRCS= file.c grep.c queue.c util.c
-.if ${MK_BSD_GREP_FASTMATCH} == "yes"
+.if !defined(MK_BSD_GREP_FASTMATCH) || ${MK_BSD_GREP_FASTMATCH} == "yes"
# Extra files ported backported for some regex improvements
.PATH: ${.CURDIR}/regex
SRCS+= fastmatch.c hashtable.c tre-compile.c tre-fastmatch.c
@@ -26,7 +26,7 @@
CFLAGS.gcc+= --param max-inline-insns-single=500
-.if ${MK_BSD_GREP} == "yes"
+.if ${PROG} == grep
LINKS= ${BINDIR}/grep ${BINDIR}/egrep \
${BINDIR}/grep ${BINDIR}/fgrep \
${BINDIR}/grep ${BINDIR}/rgrep \
@@ -44,10 +44,10 @@
LIBADD= z
-.if ${MK_LZMA_SUPPORT} != "no"
+.if !defined(MK_LZMA_SUPPORT) || ${MK_LZMA_SUPPORT} != "no"
LIBADD+= lzma
-.if ${MK_BSD_GREP} == "yes"
+.if ${PROG} == grep
LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \
${BINDIR}/${PROG} ${BINDIR}/xzegrep \
${BINDIR}/${PROG} ${BINDIR}/xzfgrep \
@@ -66,10 +66,10 @@
CFLAGS+= -DWITHOUT_LZMA
.endif
-.if ${MK_BZIP2_SUPPORT} != "no"
+.if !defined(MK_BZIP2_SUPPORT) || ${MK_BZIP2_SUPPORT} != "no"
LIBADD+= bz2
-.if ${MK_BSD_GREP} == "yes"
+.if ${PROG} == grep
LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \
${BINDIR}/grep ${BINDIR}/bzegrep \
${BINDIR}/grep ${BINDIR}/bzfgrep
@@ -81,18 +81,18 @@
CFLAGS+= -DWITHOUT_BZIP2
.endif
-.if ${MK_GNU_GREP_COMPAT} != "no"
+.if defined(MK_GNU_GREP_COMPAT) && ${MK_GNU_GREP_COMPAT} != "no"
CFLAGS+= -I${SYSROOT:U${DESTDIR}}/usr/include/gnu -DWITH_GNU
LIBADD+= gnuregex
.endif
-.if ${MK_NLS} != "no"
+.if !defined(MK_NLS) || ${MK_NLS} != "no"
.include "${.CURDIR}/nls/Makefile.inc"
.else
CFLAGS+= -DWITHOUT_NLS
.endif
-.if ${MK_TESTS} != "no"
+.if !defined(MK_TESTS) || ${MK_TESTS} != "no"
SUBDIR+= tests
.endif

File Metadata

Mime Type
text/plain
Expires
Mon, Jul 20, 5:01 PM (2 m, 29 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35279200
Default Alt Text
D11395.diff (2 KB)

Event Timeline