Index: stable/10/usr.bin/bsdcat/Makefile
===================================================================
--- stable/10/usr.bin/bsdcat/Makefile	(revision 314015)
+++ stable/10/usr.bin/bsdcat/Makefile	(revision 314016)
@@ -1,39 +1,39 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
-_LIBARCHIVEDIR=	${.CURDIR}/../../contrib/libarchive
-_LIBARCHIVECONFDIR=	${.CURDIR}/../../lib/libarchive
+_LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
+_LIBARCHIVECONFDIR=	${SRCTOP}/lib/libarchive
 
-PROG=	bsdcat	
+PROG=	bsdcat
 BSDCAT_VERSION_STRING=	3.2.2
 
 .PATH:	${_LIBARCHIVEDIR}/cat
 SRCS=	bsdcat.c cmdline.c
 
 .PATH:	${_LIBARCHIVEDIR}/libarchive_fe
 SRCS+=	err.c
 
 CFLAGS+= -DBSDCAT_VERSION_STRING=\"${BSDCAT_VERSION_STRING}\"
 CFLAGS+= -DPLATFORM_CONFIG_H=\"${_LIBARCHIVECONFDIR}/config_freebsd.h\"
 CFLAGS+= -I${_LIBARCHIVEDIR}/cat -I${_LIBARCHIVEDIR}/libarchive_fe
 
 DPADD=  ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBPTHREAD} ${LIBBSDXML}
 LDADD=  -larchive -lbz2 -lz -llzma -lpthread -lbsdxml
 .if ${MK_OPENSSL} != "no"
 DPADD+= ${LIBCRYPTO}
 LDADD+= -lcrypto
 .else
 DPADD+= ${LIBMD}
 LDADD+= -lmd
 .endif
 
 .if ${MK_ICONV} != "no"
 CFLAGS+=	-DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
 .endif
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
 .endif
 
 .include <bsd.prog.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 314015)
+++ stable/10	(revision 314016)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r313652