From e5ccba11ac59a747e359875d511d5ffc4c4b7fe7 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Tue, 23 Apr 2002 00:10:18 +0000 Subject: Don't use "GCCDIR" as the multiple inclusion protector. Subdir Makefiles may want to override GCCDIR and this gets in the way. --- gnu/usr.bin/cc/Makefile.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc index 49c1aa5de748..355b0bc9f837 100644 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -3,7 +3,9 @@ .include "../Makefile.inc" # Sometimes this is .include'd several times... -.if !defined(GCCDIR) +.if !defined(__CC_MAKEFILE_INC__) +__CC_MAKEFILE_INC__= ${MFILE} + GCCDIR= ${.CURDIR}/../../../../contrib/gcc.295 TARGET_ARCH?= ${MACHINE_ARCH} @@ -61,4 +63,4 @@ LIBCC_INT= ${.OBJDIR}/../cc_int/libcc_int.a LIBCC_INT= ${.CURDIR}/../cc_int/libcc_int.a .endif -.endif # !GCCDIR +.endif # !__CC_MAKEFILE_INC__ -- cgit v1.3