diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-12-01 22:20:04 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-12-01 22:20:04 +0000 |
| commit | 5a962dd0c6413dda6134b0aee51e4e99a3f6d1c1 (patch) | |
| tree | 776c9b339eb020689b024842cc56784cbe75e14d /lib/libarchive/tests/Makefile | |
| parent | 7f302a6c3c76177ad445353041efa95658a26b63 (diff) | |
| download | FreeBSD-src-5a962dd0c6413dda6134b0aee51e4e99a3f6d1c1.zip FreeBSD-src-5a962dd0c6413dda6134b0aee51e4e99a3f6d1c1.tar.gz | |
Don't override LIB*DIR variables from src.libnames.mk.
In some cases switch to the LIB*SRCDIR value.
These recently were defined in r291327 and r291619.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'lib/libarchive/tests/Makefile')
| -rw-r--r-- | lib/libarchive/tests/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile index a7de76b..73ded3d 100644 --- a/lib/libarchive/tests/Makefile +++ b/lib/libarchive/tests/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test @@ -9,14 +9,14 @@ BINDIR= ${TESTSDIR} PROGS+= libarchive_test CFLAGS+= -I${.CURDIR:H} -I${.OBJDIR} -CFLAGS+= -I${LIBARCHIVEDIR}/libarchive -I${LIBARCHIVEDIR}/test_utils +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive -I${_LIBARCHIVEDIR}/test_utils CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC -.PATH: ${LIBARCHIVEDIR}/libarchive/test +.PATH: ${_LIBARCHIVEDIR}/libarchive/test TESTS_SRCS= \ test_acl_freebsd_nfs4.c \ test_acl_freebsd_posix1e.c \ @@ -249,12 +249,12 @@ SRCS.libarchive_test= \ LIBADD.libarchive_test= archive -.PATH: ${LIBARCHIVEDIR}/test_utils +.PATH: ${_LIBARCHIVEDIR}/test_utils SRCS.libarchive_test+= test_utils.c # list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines list.h: ${TESTS_SRCS} Makefile - @(cd ${LIBARCHIVEDIR}/libarchive/test && \ + @(cd ${_LIBARCHIVEDIR}/libarchive/test && \ grep -h DEFINE_TEST ${.ALLSRC:N*Makefile} | \ egrep -v '${BROKEN_TESTS:tW:C/ /|/g}') > ${.TARGET}.tmp @mv ${.TARGET}.tmp ${.TARGET} |
