Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Apr 2012 04:30:22 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r233934 - stable/9/libexec/rtld-elf
Message-ID:  <201204060430.q364UM6v091632@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204060430.q364UM6v091632>