From d165b29da0cd9fd95b8d4cc00f8fd1099e4e728d Mon Sep 17 00:00:00 2001
From: Tim Kientzle <kientzle@gmail.com>
Date: Sat, 27 Jun 2009 21:45:48 -0400
Subject: [PATCH] Minor touchups for FreeBSD Makefiles.

SVN-Revision: 1198
---
 cpio/Makefile     | 2 ++
 tar/Makefile      | 7 +++++--
 tar/test/Makefile | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cpio/Makefile b/cpio/Makefile
index 28c7b7c50..de9d99b6a 100644
--- a/cpio/Makefile
+++ b/cpio/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD: src/usr.bin/cpio/Makefile,v 1.6 2008/12/06 07:30:40 kientzle Exp $
 
 .include <bsd.own.mk>
+.PATH: ${.CURDIR}/../libarchive_fe
 
 PROG=	bsdcpio
 BSDCPIO_VERSION_STRING=2.7.900a
@@ -9,6 +10,7 @@ WARNS?=	6
 DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2}
 CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
 CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
+CFLAGS+= -I../libarchive_fe
 LDADD+=	-larchive -lz -lbz2 -lmd -lcrypto
 
 .if ${MK_GNU_CPIO} != "yes"
diff --git a/tar/Makefile b/tar/Makefile
index 423f5b32c..298a2fb46 100644
--- a/tar/Makefile
+++ b/tar/Makefile
@@ -1,14 +1,17 @@
 # $FreeBSD: src/usr.bin/tar/Makefile,v 1.40 2008/12/06 07:38:14 kientzle Exp $
 
+.PATH: ${.CURDIR}/../libarchive_fe
+
 PROG=	bsdtar
 BSDTAR_VERSION_STRING=2.7.900a
-SRCS=	bsdtar.c cmdline.c getdate.c matching.c read.c siginfo.c subst.c tree.c util.c write.c
+SRCS=	bsdtar.c cmdline.c getdate.c read.c siginfo.c subst.c tree.c util.c write.c
+SRCS+=  err.c line_reader.c matching.c pathmatch.c
 WARNS?=	5
 DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
 LDADD=	-larchive -lbz2 -lz -lmd -lcrypto
 CFLAGS+=	-DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"config_freebsd.h\"
-CFLAGS+=	-I${.CURDIR}
+CFLAGS+=	-I"${.CURDIR}" -I"${.CURDIR}/../libarchive_fe"
 SYMLINKS=	bsdtar ${BINDIR}/tar
 MLINKS=	bsdtar.1 tar.1
 DEBUG_FLAGS=-g
diff --git a/tar/test/Makefile b/tar/test/Makefile
index 3edf09662..093ad1bb7 100644
--- a/tar/test/Makefile
+++ b/tar/test/Makefile
@@ -6,7 +6,7 @@ TAR_SRCDIR=${.CURDIR}/..
 
 # Some tar sources are pulled in for white-box tests
 TAR_SRCS=					\
-	../getdate.c
+	getdate.c
 
 TESTS=	\
 	test_0.c				\
-- 
2.47.3