Index: stable/10/lib/libc_nonshared/Makefile
===================================================================
--- stable/10/lib/libc_nonshared/Makefile	(revision 313593)
+++ stable/10/lib/libc_nonshared/Makefile	(revision 313594)
@@ -1,28 +1,28 @@
 # $FreeBSD$
 
 # We're actually creating a libc_noshared.a that is PIC along side libc.so.*
 # It is used exclusively with libc.so.* - there is no need for any other
 # compile modes.
 # bsd.lib.mk doesn't have an easy way to express that.
 NO_PROFILE?=
 .include <bsd.own.mk>
-NO_PIC=	
+NO_PIC=
 # -fpic on some platforms, -fPIC on others.
 CFLAGS+=${PICFLAG} -DPIC -fvisibility=hidden
 
 LIB=	c_nonshared
 
 LIBC_NONSHARED_SRCS=
 
 # So that an empty .a file doesn't cause errors.
 SRCS=	__stub.c
 
 .if ${MK_ICONV} == "yes"
-.PATH: ${.CURDIR}/../libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
 .include "Makefile.iconv"
-CFLAGS+=-I${.CURDIR}/../libc/iconv
+CFLAGS+=-I${SRCTOP}/lib/libc/iconv
 .endif
 
 SRCS+=	${LIBC_NONSHARED_SRCS}
 
 .include <bsd.lib.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 313593)
+++ stable/10	(revision 313594)

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