From owner-svn-src-stable-9@FreeBSD.ORG  Fri Apr  6 04:30:23 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 737421065679;
	Fri,  6 Apr 2012 04:30:23 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 323BA8FC24;
	Fri,  6 Apr 2012 04:30:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q364UNB3091634;
	Fri, 6 Apr 2012 04:30:23 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q364UM6v091632;
	Fri, 6 Apr 2012 04:30:23 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201204060430.q364UM6v091632@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 6 Apr 2012 04:30:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233934 - stable/9/libexec/rtld-elf
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2012 04:30:23 -0000

Author: kib
Date: Fri Apr  6 04:30:22 2012
New Revision: 233934
URL: http://svn.freebsd.org/changeset/base/233934

Log:
  MFC r233360:
  Centralize the calculation of the top source directory.

Modified:
  stable/9/libexec/rtld-elf/Makefile
Directory Properties:
  stable/9/libexec/rtld-elf/   (props changed)

Modified: stable/9/libexec/rtld-elf/Makefile
==============================================================================
--- stable/9/libexec/rtld-elf/Makefile	Fri Apr  6 04:29:17 2012	(r233933)
+++ stable/9/libexec/rtld-elf/Makefile	Fri Apr  6 04:30:22 2012	(r233934)
@@ -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