svn commit: r233360 - head/libexec/rtld-elf

[Konstantin Belousov]

Author: kib
Date: Fri Mar 23 12:10:12 2012
New Revision: 233360
URL: http://svn.freebsd.org/changeset/base/233360

Log:
  Centralize the calculation of the top source directory.  This
  simplifies the build of rtld with partial checkout, allowing to
  override only one place to reference other tree.
  
  Submitted by:	bde
  MFC after:	2 weeks

Modified:
  head/libexec/rtld-elf/Makefile

Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile	Fri Mar 23 12:06:32 2012	(r233359)
+++ head/libexec/rtld-elf/Makefile	Fri Mar 23 12:10:12 2012	(r233360)
@@ -9,8 +9,9 @@ SRCS=		rtld_start.S \
 		malloc.c xmalloc.c debug.c libmap.c
 MAN=		rtld.1
 CSTD?=		gnu99
+TOPSRCDIR=	${.CURDIR}/../..
 CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD
-CFLAGS+=	-I${.CURDIR}/../../lib/csu/common
+CFLAGS+=	-I${TOPSRCDIR}/lib/csu/common
 .if exists(${.CURDIR}/${MACHINE_ARCH})
 RTLD_ARCH=	${MACHINE_ARCH}
 .else
@@ -42,7 +43,7 @@ DPADD=		${LIBC_PIC}
 LDADD=		-lc_pic -lssp_nonshared
 
 .if ${MK_SYMVER} == "yes"
-LIBCDIR=	${.CURDIR}/../../lib/libc
+LIBCDIR=	${TOPSRCDIR}/lib/libc
 VERSION_DEF=	${LIBCDIR}/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 VERSION_MAP=	Version.map