From owner-svn-src-head@freebsd.org  Sat Feb 11 20:12:55 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 84B72CDBCFD;
 Sat, 11 Feb 2017 20:12:55 +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 54159E8D;
 Sat, 11 Feb 2017 20:12:55 +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 v1BKCs1V050010;
 Sat, 11 Feb 2017 20:12:54 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1BKCsmp050009;
 Sat, 11 Feb 2017 20:12:54 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201702112012.v1BKCsmp050009@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 11 Feb 2017 20:12:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r313650 - head/gnu/usr.bin/gdb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Feb 2017 20:12:55 -0000

Author: ngie
Date: Sat Feb 11 20:12:54 2017
New Revision: 313650
URL: https://svnweb.freebsd.org/changeset/base/313650

Log:
  Use SRCTOP/OBJTOP and simplify output using :H instead of "../" for directory
  entries
  
  This simplifies pathing in make/displayed output
  
  MFC after:	1 week
  Sponsored by:	Dell EMC Isilon

Modified:
  head/gnu/usr.bin/gdb/Makefile.inc

Modified: head/gnu/usr.bin/gdb/Makefile.inc
==============================================================================
--- head/gnu/usr.bin/gdb/Makefile.inc	Sat Feb 11 20:02:39 2017	(r313649)
+++ head/gnu/usr.bin/gdb/Makefile.inc	Sat Feb 11 20:12:54 2017	(r313650)
@@ -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