From owner-svn-src-stable@freebsd.org Tue Feb 21 02:26:58 2017 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA7E3CE7186; Tue, 21 Feb 2017 02:26:58 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6FDC21C66; Tue, 21 Feb 2017 02:26:58 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1L2QvGB016067; Tue, 21 Feb 2017 02:26:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1L2QvJP016066; Tue, 21 Feb 2017 02:26:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201702210226.v1L2QvJP016066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 21 Feb 2017 02:26:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r314010 - stable/11/gnu/usr.bin/gdb X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2017 02:26:58 -0000 Author: ngie Date: Tue Feb 21 02:26:57 2017 New Revision: 314010 URL: https://svnweb.freebsd.org/changeset/base/314010 Log: MFC r313650: Use SRCTOP/OBJTOP and simplify output using :H instead of "../" for directory entries This simplifies pathing in make/displayed output Modified: stable/11/gnu/usr.bin/gdb/Makefile.inc Directory Properties: stable/11/ (props changed) Modified: stable/11/gnu/usr.bin/gdb/Makefile.inc ============================================================================== --- stable/11/gnu/usr.bin/gdb/Makefile.inc Tue Feb 21 02:24:45 2017 (r314009) +++ stable/11/gnu/usr.bin/gdb/Makefile.inc Tue Feb 21 02:26:57 2017 (r314010) @@ -5,19 +5,17 @@ VENDOR= marcel PACKAGE= gdb -BMAKE_GDB= ${.CURDIR}/.. -BMAKE_ROOT= ${BMAKE_GDB}/.. +BMAKE_GDB= ${.CURDIR:H} +BMAKE_ROOT= ${BMAKE_GDB:H} BMAKE_BU= ${BMAKE_ROOT}/binutils -CNTRB_ROOT= ${BMAKE_ROOT}/../../contrib -CNTRB_BU= ${CNTRB_ROOT}/binutils -CNTRB_GDB= ${CNTRB_ROOT}/gdb -CNTRB_RL= ${CNTRB_ROOT}/libreadline - -OBJ_ROOT= ${.OBJDIR}/../.. -OBJ_BU= ${OBJ_ROOT}/binutils -OBJ_GDB= ${OBJ_ROOT}/gdb -OBJ_RL= ${OBJ_ROOT}/../lib/libreadline/readline +CNTRB_BU= ${SRCTOP}/contrib/binutils +CNTRB_GDB= ${SRCTOP}/contrib/gdb +CNTRB_RL= ${SRCTOP}/contrib/libreadline + +OBJ_BU= ${OBJTOP}/gnu/usr.bin/binutils +OBJ_GDB= ${OBJTOP}/gnu/usr.bin/gdb +OBJ_RL= ${OBJTOP}/gnu/lib/libreadline/readline # These assignments duplicate much of the functionality of # MACHINE_CPUARCH, but there's no easy way to export make functions... @@ -47,12 +45,12 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config CFLAGS+= -I${CNTRB_BU}/include CFLAGS+= -I${CNTRB_GDB}/include CFLAGS+= -I${CNTRB_BU}/bfd -CFLAGS+= -I${OBJ_RL}/.. +CFLAGS+= -I${OBJ_RL:H} GENSRCS+= nm.h tm.h .if defined(GDB_CROSS_DEBUGGER) -CFLAGS+= -DCROSS_DEBUGGER -I${BMAKE_ROOT}/../.. +CFLAGS+= -DCROSS_DEBUGGER -I${BMAKE_ROOT:H:H} GDB_SUFFIX= -${TARGET_ARCH} MAN= .endif