diff options
| author | ngie <ngie@FreeBSD.org> | 2015-10-06 21:43:37 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-10-06 21:43:37 +0000 |
| commit | a6c3db22355401f279babb79f255d1e95c89dac3 (patch) | |
| tree | da0fc986b90b658b73bc7c489013391543e8ff44 /lib/libarchive | |
| parent | 8cad7e1c527746c00149bc4b9faabc41bfa22295 (diff) | |
| download | FreeBSD-src-a6c3db22355401f279babb79f255d1e95c89dac3.zip FreeBSD-src-a6c3db22355401f279babb79f255d1e95c89dac3.tar.gz | |
MFhead @ r288954
Diffstat (limited to 'lib/libarchive')
| -rw-r--r-- | lib/libarchive/Makefile | 9 | ||||
| -rw-r--r-- | lib/libarchive/tests/Makefile (renamed from lib/libarchive/test/Makefile) | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index 3870de2..23675eb 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -398,11 +398,8 @@ MLINKS+= archive_write_set_options.3 archive_write_set_format_option.3 MLINKS+= archive_write_set_options.3 archive_write_set_option.3 MLINKS+= libarchive.3 archive.3 -.PHONY: check test clean-test -check test: - cd ${.CURDIR}/test && make obj && make test - -clean-test: - cd ${.CURDIR}/test && make clean +.if ${MK_TESTS} != "no" +#SUBDIR+= tests +.endif .include <bsd.lib.mk> diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/tests/Makefile index e57c5ff..fa710e3 100644 --- a/lib/libarchive/test/Makefile +++ b/lib/libarchive/tests/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -LIBARCHIVEDIR= ${.CURDIR}/../../../contrib/libarchive +LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive MAN= |
