From 120a95cb5080c7dcf6fde1b171f381b98ad28ce7 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Thu, 13 Mar 2003 18:55:14 +0000
Subject: [PATCH] Clean up the way gdtoa sources are found.

OK'ed by:	das
---
 lib/libc/Makefile           | 8 +-------
 lib/libc/gdtoa/Makefile.inc | 7 ++++++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index a6b898980b2e..a724543fdfd9 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -24,13 +24,6 @@ MDASM=
 MIASM=
 NOASM=
 
-# XXX Pull in contrib/netlib/gdtoa, but keep the filenames local to
-#     gdtoa out of libc.
-.PATH:	${.CURDIR}/../../contrib/netlib/gdtoa
-.include "${.CURDIR}/gdtoa/Makefile.inc"
-.PATH:
-.PATH: ${.CURDIR}/gdtoa
-
 #
 # If there is a machine dependent makefile, use it:
 #
@@ -40,6 +33,7 @@ NOASM=
 
 .include "${.CURDIR}/db/Makefile.inc"
 .include "${.CURDIR}/compat-43/Makefile.inc"
+.include "${.CURDIR}/gdtoa/Makefile.inc"
 .include "${.CURDIR}/gen/Makefile.inc"
 .if ${MACHINE_ARCH} != "powerpc"
 .include "${.CURDIR}/gmon/Makefile.inc"
diff --git a/lib/libc/gdtoa/Makefile.inc b/lib/libc/gdtoa/Makefile.inc
index c2c58e119473..06281d1685b9 100644
--- a/lib/libc/gdtoa/Makefile.inc
+++ b/lib/libc/gdtoa/Makefile.inc
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-CFLAGS+=-I${.CURDIR}/../../contrib/gdtoa
+# netlib gdtoa sources
+.PATH: ${.CURDIR}/gdtoa
+
 MISRCS+=glue.c
 GDTOASRCS=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \
 	hd_init.c hexnan.c misc.c smisc.c \
@@ -8,6 +10,9 @@ GDTOASRCS=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \
 .if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/gdtoa.mk)
 .include "${.CURDIR}/${MACHINE_ARCH}/stdlib/gdtoa.mk"
 .endif
+
+CFLAGS+=-I${.CURDIR}/../../contrib/gdtoa
+
 .for src in ${GDTOASRCS}
 MISRCS+=gdtoa_${src}
 CLEANFILES+=gdtoa_${src}