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/cpio | |
| parent | de52e5bdca088414f71d5faecfd7ccb42b4988d1 (diff) | |
| download | src-3c89d6b0e37f4c8fd151aa06bc7af33d74fb54b6.tar.gz src-3c89d6b0e37f4c8fd151aa06bc7af33d74fb54b6.zip | |
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
Notes
Notes:
svn path=/head/; revision=291620
Diffstat (limited to 'usr.bin/cpio')
| -rw-r--r-- | usr.bin/cpio/Makefile | 12 | ||||
| -rw-r--r-- | usr.bin/cpio/tests/Makefile | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index 3b50742ea20d..a0578226be1c 100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -2,21 +2,21 @@ .include <src.opts.mk> -LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive -LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive +_LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive +_LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive PROG= bsdcpio BSDCPIO_VERSION_STRING= 3.1.2 -.PATH: ${LIBARCHIVEDIR}/cpio +.PATH: ${_LIBARCHIVEDIR}/cpio SRCS= cpio.c cmdline.c -.PATH: ${LIBARCHIVEDIR}/libarchive_fe +.PATH: ${_LIBARCHIVEDIR}/libarchive_fe SRCS+= err.c line_reader.c CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\" -CFLAGS+= -DPLATFORM_CONFIG_H=\"${LIBARCHIVECONFDIR}/config_freebsd.h\" -CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe +CFLAGS+= -DPLATFORM_CONFIG_H=\"${_LIBARCHIVECONFDIR}/config_freebsd.h\" +CFLAGS+= -I${_LIBARCHIVEDIR}/cpio -I${_LIBARCHIVEDIR}/libarchive_fe .ifdef RELEASE_CRUNCH # FreeBSD's installer uses cpio in crunched binaries that are diff --git a/usr.bin/cpio/tests/Makefile b/usr.bin/cpio/tests/Makefile index d633abd96bd3..532e2eca6539 100644 --- a/usr.bin/cpio/tests/Makefile +++ b/usr.bin/cpio/tests/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive ATF_TESTS_SH+= functional_test @@ -12,20 +12,20 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} CFLAGS+= -I${.OBJDIR} -CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe -CFLAGS+= -I${LIBARCHIVEDIR}/test_utils +CFLAGS+= -I${_LIBARCHIVEDIR}/cpio -I${_LIBARCHIVEDIR}/libarchive_fe +CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils # Uncomment to link against dmalloc #LDADD+= -L/usr/local/lib -ldmalloc #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC -.PATH: ${LIBARCHIVEDIR}/cpio +.PATH: ${_LIBARCHIVEDIR}/cpio CPIO_SRCS= cmdline.c -.PATH: ${LIBARCHIVEDIR}/libarchive_fe +.PATH: ${_LIBARCHIVEDIR}/libarchive_fe CPIO_SRCS+= err.c -.PATH: ${LIBARCHIVEDIR}/cpio/test +.PATH: ${_LIBARCHIVEDIR}/cpio/test TESTS_SRCS= \ test_0.c \ test_basic.c \ @@ -75,13 +75,13 @@ SRCS.bsdcpio_test= list.h \ ${TESTS_SRCS} \ main.c -.PATH: ${LIBARCHIVEDIR}/test_utils +.PATH: ${_LIBARCHIVEDIR}/test_utils SRCS.bsdcpio_test+= test_utils.c LIBADD.bsdcpio_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} |