diff options
| author | gabor <gabor@FreeBSD.org> | 2011-10-11 22:27:23 +0000 |
|---|---|---|
| committer | gabor <gabor@FreeBSD.org> | 2011-10-11 22:27:23 +0000 |
| commit | afe335edb5ec5cb5b15074c5f300c5055f76f73b (patch) | |
| tree | 6864876fce7349bb828446411f1b587ad7e18e64 /usr.bin/grep/Makefile | |
| parent | 2a4bf1ea8bf0f83e7562db32f157e58bef2cf214 (diff) | |
| download | FreeBSD-src-afe335edb5ec5cb5b15074c5f300c5055f76f73b.zip FreeBSD-src-afe335edb5ec5cb5b15074c5f300c5055f76f73b.tar.gz | |
- Use getprogname() instead of __progname
- Allow disabling bzip2 support with WITHOUT_BZIP2
- Fix handling patterns that start with a dot
- Remove superfluous semicolon
Approved by: delphij (mentor)
Diffstat (limited to 'usr.bin/grep/Makefile')
| -rw-r--r-- | usr.bin/grep/Makefile | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile index 75fad49..1bd34ff 100644 --- a/usr.bin/grep/Makefile +++ b/usr.bin/grep/Makefile @@ -26,9 +26,6 @@ LINKS= ${BINDIR}/grep ${BINDIR}/egrep \ ${BINDIR}/grep ${BINDIR}/zgrep \ ${BINDIR}/grep ${BINDIR}/zegrep \ ${BINDIR}/grep ${BINDIR}/zfgrep \ - ${BINDIR}/grep ${BINDIR}/bzgrep \ - ${BINDIR}/grep ${BINDIR}/bzegrep \ - ${BINDIR}/grep ${BINDIR}/bzfgrep \ ${BINDIR}/grep ${BINDIR}/xzgrep \ ${BINDIR}/grep ${BINDIR}/xzegrep \ ${BINDIR}/grep ${BINDIR}/xzfgrep \ @@ -41,9 +38,6 @@ MLINKS= grep.1 egrep.1 \ grep.1 zgrep.1 \ grep.1 zegrep.1 \ grep.1 zfgrep.1 \ - grep.1 bzgrep.1 \ - grep.1 bzegrep.1 \ - grep.1 bzfgrep.1 \ grep.1 xzgrep.1 \ grep.1 xzegrep.1 \ grep.1 xzfgrep.1 \ @@ -52,8 +46,22 @@ MLINKS= grep.1 egrep.1 \ grep.1 lzfgrep.1 .endif -LDADD= -lz -lbz2 -llzma -DPADD= ${LIBZ} ${LIBBZ2} ${LIBLZMA} +LDADD= -lz -llzma +DPADD= ${LIBZ} ${LIBLZMA} + +.if !defined(WITHOUT_BZIP2) +LDADD+= -lbz2 +DPADD+= ${LIBBZ2} + +LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \ + ${BINDIR}/grep ${BINDIR}/bzegrep \ + ${BINDIR}/grep ${BINDIR}/bzfgrep +MLINKS+= grep.1 bzgrep.1 \ + grep.1 bzegrep.1 \ + grep.1 bzfgrep.1 +.else +CFLAGS+= -DWITHOUT_BZIP2 +.endif .if !defined(WITHOUT_GNU_COMPAT) CFLAGS+= -I/usr/include/gnu |
