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 /usr.bin/tar/tests | |
| 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 'usr.bin/tar/tests')
| -rw-r--r-- | usr.bin/tar/tests/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tar/tests/Makefile b/usr.bin/tar/tests/Makefile index 02918b3..96800a5 100644 --- a/usr.bin/tar/tests/Makefile +++ b/usr.bin/tar/tests/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test @@ -9,7 +9,7 @@ BINDIR= ${TESTSDIR} CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" CFLAGS+= -static CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} -CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/test_utils +CFLAGS+= -I${_LIBARCHIVEDIR}/tar -I${_LIBARCHIVEDIR}/test_utils # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc @@ -17,7 +17,7 @@ CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/test_utils PROGS+= bsdtar_test -.PATH: ${LIBARCHIVEDIR}/tar/test +.PATH: ${_LIBARCHIVEDIR}/tar/test TESTS_SRCS= \ test_0.c \ test_basic.c \ @@ -75,13 +75,13 @@ SRCS.bsdtar_test= \ list.h \ main.c -.PATH: ${LIBARCHIVEDIR}/test_utils +.PATH: ${_LIBARCHIVEDIR}/test_utils SRCS.bsdtar_test+= test_utils.c LIBADD.bsdtar_test= archive list.h: ${TESTS_SRCS} Makefile - @(cd ${LIBARCHIVEDIR}/tar/test && \ + @(cd ${_LIBARCHIVEDIR}/tar/test && \ grep -h DEFINE_TEST ${.ALLSRC:N*Makefile}) > ${.TARGET}.tmp @mv ${.TARGET}.tmp ${.TARGET} |
