aboutsummaryrefslogtreecommitdiffstats
path: root/usr.bin/cpio/Makefile
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2008-06-16 05:48:15 +0000
committerDoug Barton <dougb@FreeBSD.org>2008-06-16 05:48:15 +0000
commit6973701a00e3228aeb354768f596e5c35663bdb2 (patch)
tree99c6827a2e7144624bf91733ea77fd80d6aaffb5 /usr.bin/cpio/Makefile
parent076a71a21e4f85ed1a0efd9fb72f6a104dede512 (diff)
downloadsrc-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 'usr.bin/cpio/Makefile')
-rw-r--r--usr.bin/cpio/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index cc5c1065f251..52d23f09c116 100644
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@@ -9,7 +9,7 @@ CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
LDADD+= -larchive -lz -lbz2
-.if defined(WITH_BSDCPIO)
+.if ${MK_GNU_CPIO} != "yes"
SYMLINKS=bsdcpio ${BINDIR}/cpio
MLINKS= bsdcpio.1 cpio.1
.endif