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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
