diff options
| author | mm <mm@FreeBSD.org> | 2011-12-22 08:42:07 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2011-12-22 08:42:07 +0000 |
| commit | 2942879b6ed0f413f59c085747271ea20b06e8f1 (patch) | |
| tree | 45fc0471cfcb1121eec518837ba50f8c9e108dbe /lib/libarchive/Makefile | |
| parent | e043036a251d22e3cb85c0db5bd28c8ee58cbd24 (diff) | |
| download | FreeBSD-src-2942879b6ed0f413f59c085747271ea20b06e8f1.zip FreeBSD-src-2942879b6ed0f413f59c085747271ea20b06e8f1.tar.gz | |
Use contrib sources for building libarchive, tar and cpio.
Make "make test" fully operational.
MFC after: 2 weeks
Diffstat (limited to 'lib/libarchive/Makefile')
| -rw-r--r-- | lib/libarchive/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index 8d889c8..92ca954 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -1,6 +1,8 @@ # $FreeBSD$ .include <bsd.own.mk> +LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive + LIB= archive DPADD= ${LIBZ} LDADD= -lz @@ -20,7 +22,7 @@ LDADD+= -lbsdxml # It has no real relation to the libarchive version number. SHLIB_MAJOR= 5 -CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" +CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" CFLAGS+= -I${.OBJDIR} .if ${MK_OPENSSL} != "no" @@ -32,6 +34,8 @@ DPADD+= ${LIBMD} LDADD+= -lmd .endif +.PATH: ${LIBARCHIVEDIR}/libarchive + # Headers to be installed in /usr/include INCS= archive.h archive_entry.h @@ -273,8 +277,11 @@ MLINKS+= archive_write_disk.3 archive_write_disk_set_standard_lookup.3 MLINKS+= archive_write_disk.3 archive_write_disk_set_user_lookup.3 MLINKS+= libarchive.3 archive.3 -.PHONY: check test +.PHONY: check test clean-test check test: - cd ${.CURDIR}/test && make test + cd ${.CURDIR}/test && make obj && make test + +clean-test: + cd ${.CURDIR}/test && make clean .include <bsd.lib.mk> |
