aboutsummaryrefslogtreecommitdiffstats
path: root/usr.bin/cpio/Makefile
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2011-12-22 08:42:07 +0000
committerMartin Matuska <mm@FreeBSD.org>2011-12-22 08:42:07 +0000
commit45d3b226a6370e9c8a99d042320250d96c9daf32 (patch)
tree45fc0471cfcb1121eec518837ba50f8c9e108dbe /usr.bin/cpio/Makefile
parente2ee19e346a40c3f2946b4c7424454b5a5ef5dd2 (diff)
downloadsrc-45d3b226a6370e9c8a99d042320250d96c9daf32.tar.gz
src-45d3b226a6370e9c8a99d042320250d96c9daf32.zip
Use contrib sources for building libarchive, tar and cpio.
Make "make test" fully operational. MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=228797
Diffstat (limited to 'usr.bin/cpio/Makefile')
-rw-r--r--usr.bin/cpio/Makefile16
1 files changed, 11 insertions, 5 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index fb40ef93024b..f13b626a3cfd 100644
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@@ -2,17 +2,20 @@
.include <bsd.own.mk>
+LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive
+
PROG= bsdcpio
BSDCPIO_VERSION_STRING=2.8.5
+.PATH: ${LIBARCHIVEDIR}/cpio
SRCS= cpio.c cmdline.c
-.PATH: ${.CURDIR}/../../lib/libarchive/libarchive_fe
+.PATH: ${LIBARCHIVEDIR}/libarchive_fe
SRCS+= err.c line_reader.c matching.c pathmatch.c
CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
-CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libarchive/libarchive_fe
+CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
+CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe
.ifdef RELEASE_CRUNCH
# FreeBSD's installer uses cpio in crunched binaries that are
@@ -32,9 +35,12 @@ LDADD+= -lmd
SYMLINKS=bsdcpio ${BINDIR}/cpio
MLINKS= bsdcpio.1 cpio.1
-.PHONY: check test
+.PHONY: check test clean-test
check test: $(PROG) bsdcpio.1.gz
- cd ${.CURDIR}/test && make clean test
+ cd ${.CURDIR}/test && make obj && make test
+
+clean-test:
+ cd ${.CURDIR}/test && make clean
.include <bsd.prog.mk>