Index: stable/10/lib/libkiconv/Makefile
===================================================================
--- stable/10/lib/libkiconv/Makefile	(revision 313620)
+++ stable/10/lib/libkiconv/Makefile	(revision 313621)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 SHLIBDIR?=	/lib
 
 .include <bsd.own.mk>
 
 LIB=		kiconv
 SRCS=		kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c
 SRCS+=		quirks.c
 
 SHLIB_MAJOR=	4
 
 MAN=		kiconv.3
 
 MLINKS+=	kiconv.3 kiconv_add_xlat16_cspair.3 \
 		kiconv.3 kiconv_add_xlat16_cspairs.3 \
 		kiconv.3 kiconv_add_xlat16_table.3
 
-CFLAGS+=	-I${.CURDIR}/../../sys
+CFLAGS+=	-I${SRCTOP}/sys
 
 WARNS?=		1
 
 .if ${MK_ICONV} == "no"
 CFLAGS+=	-DICONV_DLOPEN
 .endif
 
 .include <bsd.lib.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 313620)
+++ stable/10	(revision 313621)

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