diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2008-06-16 05:48:15 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2008-06-16 05:48:15 +0000 |
| commit | 6973701a00e3228aeb354768f596e5c35663bdb2 (patch) | |
| tree | 99c6827a2e7144624bf91733ea77fd80d6aaffb5 /gnu/usr.bin/Makefile | |
| parent | 076a71a21e4f85ed1a0efd9fb72f6a104dede512 (diff) | |
| download | src-6973701a00e3228aeb354768f596e5c35663bdb2.tar.gz src-6973701a00e3228aeb354768f596e5c35663bdb2.zip | |
1. Make the BSD version of cpio the default [1]
a. The BSD version will be built and installed unless
WITHOUT_BSD_CPIO is defined.
b. The GNU version will not be built or installed unless
WITH_GNU_CPIO is defined. If this is defined, the symlink
in /usr/bin will be to the GNU version whether the BSD
version is present or not.
When these changes are MFCed the defaults should be flipped.
2. Add a knob to disable the building of GNU grep. This will
make it easier for those that want to test the BSD version in
the ports.
Approved by: kientzle [1]
Notes
Notes:
svn path=/head/; revision=179813
Diffstat (limited to 'gnu/usr.bin/Makefile')
| -rw-r--r-- | gnu/usr.bin/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index b54f8409655d..10f230080e16 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -5,7 +5,7 @@ SUBDIR= bc \ ${_binutils} \ ${_cc} \ - cpio \ + ${_cpio} \ ${_cvs} \ dc \ dialog \ @@ -13,7 +13,7 @@ SUBDIR= bc \ diff3 \ ${_gdb} \ ${_gperf} \ - grep \ + ${_grep} \ ${_groff} \ ${_man} \ patch \ @@ -30,10 +30,18 @@ _groff= groff .endif .endif +.if ${MK_GNU_CPIO} == "yes" +_cpio= cpio +.endif + .if ${MK_CVS} != "no" _cvs= cvs .endif +.if ${MK_GNU_GREP} != "no" +_grep= grep +.endif + .if ${MK_MAN} != "no" _man= man .endif |