diff options
| author | dougb <dougb@FreeBSD.org> | 2008-06-16 05:48:15 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2008-06-16 05:48:15 +0000 |
| commit | aab693d38cf65888cc33b7b946ce34c1913846d1 (patch) | |
| tree | 99c6827a2e7144624bf91733ea77fd80d6aaffb5 /usr.bin/Makefile | |
| parent | a7b386d2c5903efa1dfcce5093ee074e399e23d2 (diff) | |
| download | FreeBSD-src-aab693d38cf65888cc33b7b946ce34c1913846d1.zip FreeBSD-src-aab693d38cf65888cc33b7b946ce34c1913846d1.tar.gz | |
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]
Diffstat (limited to 'usr.bin/Makefile')
| -rw-r--r-- | usr.bin/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 241d3eb..02ae8b4 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -43,7 +43,7 @@ SUBDIR= alias \ comm \ compile_et \ compress \ - cpio \ + ${_cpio} \ cpuset \ csplit \ ${_csup} \ @@ -257,6 +257,10 @@ _nsupdate= nsupdate _bluetooth= bluetooth .endif +.if ${MK_BSD_CPIO} != "no" +_cpio= cpio +.endif + .if ${MK_CALENDAR} != "no" _calendar= calendar .endif |
