diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-01 22:20:04 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-01 22:20:04 +0000 |
| commit | 3c89d6b0e37f4c8fd151aa06bc7af33d74fb54b6 (patch) | |
| tree | 776c9b339eb020689b024842cc56784cbe75e14d /usr.bin/tar | |
| parent | de52e5bdca088414f71d5faecfd7ccb42b4988d1 (diff) | |
| download | src-test2-3c89d6b0e37f4c8fd151aa06bc7af33d74fb54b6.tar.gz src-test2-3c89d6b0e37f4c8fd151aa06bc7af33d74fb54b6.zip | |
Notes
Diffstat (limited to 'usr.bin/tar')
| -rw-r--r-- | usr.bin/tar/Makefile | 10 | ||||
| -rw-r--r-- | usr.bin/tar/tests/Makefile | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index 47416f8da7fc..8ac2005caa03 100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ .include <src.opts.mk> -LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive +_LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive PROG= bsdtar BSDTAR_VERSION_STRING= 3.1.2 -.PATH: ${LIBARCHIVEDIR}/tar +.PATH: ${_LIBARCHIVEDIR}/tar SRCS= bsdtar.c \ cmdline.c \ creation_set.c \ @@ -15,7 +15,7 @@ SRCS= bsdtar.c \ util.c \ write.c -.PATH: ${LIBARCHIVEDIR}/libarchive_fe +.PATH: ${_LIBARCHIVEDIR}/libarchive_fe SRCS+= err.c \ line_reader.c @@ -27,8 +27,8 @@ CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const CFLAGS+= -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\" CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../lib/libarchive/config_freebsd.h\" -CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/libarchive -CFLAGS+= -I${LIBARCHIVEDIR}/libarchive_fe +CFLAGS+= -I${_LIBARCHIVEDIR}/tar -I${_LIBARCHIVEDIR}/libarchive +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive_fe SYMLINKS= bsdtar ${BINDIR}/tar MLINKS= bsdtar.1 tar.1 diff --git a/usr.bin/tar/tests/Makefile b/usr.bin/tar/tests/Makefile index 02918b3b461f..96800a5bf1d6 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} |