Index: stable/10/lib/libiconv_modules/Makefile.inc
===================================================================
--- stable/10/lib/libiconv_modules/Makefile.inc	(revision 313625)
+++ stable/10/lib/libiconv_modules/Makefile.inc	(revision 313626)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
 
 SHLIB_MAJOR= 4
 WARNS?=	6
-CFLAGS+= -I${.CURDIR}/../../libc/iconv
+CFLAGS+= -I${SRCTOP}/lib/libc/iconv
 
 CFLAGS+=	-Dbool=_Bool
 
 .if !defined(COMPAT_32BIT)
 SHLIBDIR= /usr/lib/i18n
 .else
 SHLIBDIR= /usr/lib32/i18n
 .endif
 LIBDIR=	 ${SHLIBDIR}
 NO_PROFILE=
Index: stable/10/lib/libiconv_modules/mapper_parallel/Makefile
===================================================================
--- stable/10/lib/libiconv_modules/mapper_parallel/Makefile	(revision 313625)
+++ stable/10/lib/libiconv_modules/mapper_parallel/Makefile	(revision 313626)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../mapper_serial
+.PATH: ${.CURDIR:H}/mapper_serial
 
 SHLIB=	mapper_parallel
 SRCS+=	citrus_mapper_serial.c
 CFLAGS.gcc+= --param max-inline-insns-single=32
 
 .include <bsd.lib.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 313625)
+++ stable/10	(revision 313626)

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