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 | |
| parent | 076a71a21e4f85ed1a0efd9fb72f6a104dede512 (diff) | |
Notes
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 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 diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile index 211b068cf60b..96ac02a86dba 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> |