From b2198963be25eb6cb84ac06ca719ebc9a776989b Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Fri, 1 May 1998 14:37:36 +0000
Subject: [PATCH] Removed self-inclusion-prevention ifdef.  It is unnecessary
 now that bsd.man.mk doesn't include ${.CURDIR}/../Makefile.inc.

Removed GDBDIR-redefinition-prevention ifdef.  It hasn't done anothing
for a long time, if ever.  The directory is defined to the same value in
each subdir and had the same value because all subdirs are at the same
level.  Keep defining it in the subdirs since that is more flexible and
no more verbose.

Prepare to inherit BINDIR by including ../Makefile.inc.
---
 gnu/usr.bin/gdb/Makefile.inc | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc
index 2056d9b8f9cc..c031ae9eddbb 100644
--- a/gnu/usr.bin/gdb/Makefile.inc
+++ b/gnu/usr.bin/gdb/Makefile.inc
@@ -1,14 +1,7 @@
-# bsd.lib.mk causes this file to be loaded multiple times.
-.if !defined(GDB_MAKEFILE_INC_BEEN_HERE)
-GDB_MAKEFILE_INC_BEEN_HERE=yes
+#	$Id$
 
-# this may be defined in other places
-.if !defined(GDBDIR)
-GDBDIR=	${.CURDIR}/../../../../contrib/gdb
-.endif
+CFLAGS+=-I${GDBDIR}/include -I${GDBDIR}/gdb -I${GDBDIR}/bfd
+CFLAGS+=-I${GDBDIR}/libiberty -I${GDBDIR}/gdb/config
+CFLAGS+=-DHAVE_CONFIG_H
 
-CFLAGS+= -I${GDBDIR}/include/. -I${GDBDIR}/gdb/. -I${GDBDIR}/bfd/.
-CFLAGS+= -I${GDBDIR}/libiberty/.
-CFLAGS+= -I${GDBDIR}/gdb/config/.
-CFLAGS+= -DHAVE_CONFIG_H
-.endif
+.include "../Makefile.inc"