summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1998-10-15 14:15:09 +0000
committerbde <bde@FreeBSD.org>1998-10-15 14:15:09 +0000
commit34ec08b0e276ec58e0134cf399ef1bc2c166e6ff (patch)
tree01cec64208c041185431fc927fd26141f0fac4de /gnu
parent080437aa74da08879859ddbc23593fc94e65a3ce (diff)
downloadFreeBSD-src-34ec08b0e276ec58e0134cf399ef1bc2c166e6ff.zip
FreeBSD-src-34ec08b0e276ec58e0134cf399ef1bc2c166e6ff.tar.gz
Fixed breakage of gdbreplay's and gdbserver's BINDIR in previous commit.
They may belong in /usr/libexec/{aout,elf}, but objformat doesn't support that. Fixed bogus `?=' assignments for BINDIR.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/binutils/gdb/Makefile4
-rw-r--r--gnu/usr.bin/gdb/Makefile.inc8
-rw-r--r--gnu/usr.bin/gdb/gdb/Makefile4
3 files changed, 7 insertions, 9 deletions
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index b4a2442..bc194ac 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -1,12 +1,14 @@
-# $Id: Makefile,v 1.36 1998/08/30 02:46:35 jb Exp $
+# $Id: Makefile,v 1.37 1998/09/14 22:49:01 jdp Exp $
PROG = gdb
GDBDIR= ${.CURDIR}/../../../../contrib/gdb
.if ${OBJFORMAT} == elf
BFDDIR= ${.CURDIR}/../../binutils/libbfd/${MACHINE_ARCH}
+BINDIR= /usr/libexec/elf
.else
BFDDIR= ${.CURDIR}/../bfd
+BINDIR= /usr/libexec/aout
.endif
.PATH: ${GDBDIR}/gdb
.PATH: ${GDBDIR}/opcodes
diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc
index aa69d58..5e39707 100644
--- a/gnu/usr.bin/gdb/Makefile.inc
+++ b/gnu/usr.bin/gdb/Makefile.inc
@@ -1,13 +1,7 @@
-# $Id: Makefile.inc,v 1.4 1998/05/01 14:37:36 bde Exp $
+# $Id: Makefile.inc,v 1.5 1998/10/15 00:15:01 peter Exp $
CFLAGS+=-I${GDBDIR}/include -I${GDBDIR}/gdb -I${GDBDIR}/bfd
CFLAGS+=-I${GDBDIR}/libiberty -I${GDBDIR}/gdb/config
CFLAGS+=-DHAVE_CONFIG_H
-.if ${OBJFORMAT} == elf
-BINDIR?= /usr/libexec/elf
-.else
-BINDIR?= /usr/libexec/aout
-.endif
-
.include "../Makefile.inc"
diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index b4a2442..bc194ac 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -1,12 +1,14 @@
-# $Id: Makefile,v 1.36 1998/08/30 02:46:35 jb Exp $
+# $Id: Makefile,v 1.37 1998/09/14 22:49:01 jdp Exp $
PROG = gdb
GDBDIR= ${.CURDIR}/../../../../contrib/gdb
.if ${OBJFORMAT} == elf
BFDDIR= ${.CURDIR}/../../binutils/libbfd/${MACHINE_ARCH}
+BINDIR= /usr/libexec/elf
.else
BFDDIR= ${.CURDIR}/../bfd
+BINDIR= /usr/libexec/aout
.endif
.PATH: ${GDBDIR}/gdb
.PATH: ${GDBDIR}/opcodes
OpenPOWER on IntegriCloud