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 /gnu | |
| 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 'gnu')
| -rw-r--r-- | gnu/usr.bin/Makefile | 12 | ||||
| -rw-r--r-- | gnu/usr.bin/cpio/Makefile | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index b54f840..10f2300 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 diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile index 211b068..96ac02a 100644 --- a/gnu/usr.bin/cpio/Makefile +++ b/gnu/usr.bin/cpio/Makefile @@ -62,9 +62,7 @@ CFLAGS+=-I${.OBJDIR} -I${.CURDIR} -I${CPIODIR}/lib -DHAVE_CONFIG_H \ gcpio.1: ${CPIODIR}/doc/cpio.1 cat ${CPIODIR}/doc/cpio.1 >gcpio.1 -.if !defined(WITH_BSDCPIO) SYMLINKS=gcpio ${BINDIR}/cpio MLINKS=gcpio.1 cpio.1 -.endif .include <bsd.prog.mk> |
