From 630c9d1ce831282170ec1835ed788e7125519f32 Mon Sep 17 00:00:00 2001
From: John Marino <draco@marino.st>
Date: Thu, 30 Jul 2015 23:30:40 +0200
Subject: [PATCH] gcc50: Adjust makefiles for new file locations

---
 .../gcc50/libstdcxx/components/libconv_1998/Makefile   | 10 ++++++++--
 gnu/lib/gcc50/libstdcxx/headers/Makefile.headers       | 10 +++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/gnu/lib/gcc50/libstdcxx/components/libconv_1998/Makefile b/gnu/lib/gcc50/libstdcxx/components/libconv_1998/Makefile
index ea0081eb79..96fe9bb755 100644
--- a/gnu/lib/gcc50/libstdcxx/components/libconv_1998/Makefile
+++ b/gnu/lib/gcc50/libstdcxx/components/libconv_1998/Makefile
@@ -19,7 +19,8 @@ CXXFLAGS+=	-ffunction-sections -fdata-sections
 SHARED_CXXFLAGS=	-D_GLIBCXX_SHARED
 
 SRCS=	${libc__98convenience_la_SOURCES}
-COW=	collate.x messages.x monetary.x numeric.x
+COWD=	collate.x monetary.x numeric.x
+COWG=	messages.x
 GENCC=	atomicity.cc basic_file.cc c++locale.cc ${COW:.x=_members_cow.cc}
 
 FLAGS_GROUPS=		gnu11 cow concept explicit
@@ -42,11 +43,16 @@ explicit_FLAGS_FILES+=	${F}
 . endif
 .endfor
 
-.for F in ${COW}
+.for F in ${COWG}
 ${F:.x=_members_cow.cc}: ${SRCDIR}/config/locale/generic/${F:.x=_members.cc}
 	cp ${.ALLSRC} ${.TARGET}
 .endfor
 
+.for F in ${COWD}
+${F:.x=_members_cow.cc}: ${SRCDIR}/config/locale/dragonfly/${F:.x=_members.cc}
+	cp ${.ALLSRC} ${.TARGET}
+.endfor
+
 atomicity.cc: ${SRCDIR}/config/cpu/generic/atomicity_builtins/atomicity.h
 	cp ${.ALLSRC} ${.TARGET}
 
diff --git a/gnu/lib/gcc50/libstdcxx/headers/Makefile.headers b/gnu/lib/gcc50/libstdcxx/headers/Makefile.headers
index 97a702a451..072aaa7e3e 100644
--- a/gnu/lib/gcc50/libstdcxx/headers/Makefile.headers
+++ b/gnu/lib/gcc50/libstdcxx/headers/Makefile.headers
@@ -3,12 +3,12 @@
 
 COMPATIBILITY_H = config/abi/compatibility.h
 CLOCALE_CC = config/locale/dragonfly/c_locale.cc
-CLOCALE_H = config/locale/generic/c_locale.h
+CLOCALE_H = config/locale/dragonfly/c_locale.h
 CLOCALE_INTERNAL_H = config/locale/generic/c++locale_internal.h
 CMESSAGES_CC = config/locale/generic/messages_members.cc
 CMESSAGES_H = config/locale/generic/messages_members.h
-CMONEY_CC = config/locale/generic/monetary_members.cc
-CNUMERIC_CC = config/locale/generic/numeric_members.cc
+CMONEY_CC = config/locale/dragonfly/monetary_members.cc
+CNUMERIC_CC = config/locale/dragonfly/numeric_members.cc
 ATOMIC_WORD_SRCDIR = config/cpu/generic
 ABI_TWEAKS_SRCDIR = config/cpu/generic
 CPU_DEFINES_SRCDIR = config/cpu/generic
@@ -61,9 +61,9 @@ host_headers_extra = \
 	c++config.h \
 	${glibcxx_srcdir}/config/allocator/new_allocator_base.h \
 	${glibcxx_srcdir}/config/io/c_io_stdio.h \
-	${glibcxx_srcdir}/config/locale/generic/c_locale.h \
+	${glibcxx_srcdir}/config/locale/dragonfly/c_locale.h \
 	${glibcxx_srcdir}/config/locale/generic/messages_members.h \
-	${glibcxx_srcdir}/config/locale/generic/time_members.h \
+	${glibcxx_srcdir}/config/locale/dragonfly/time_members.h \
 	${glibcxx_srcdir}/${CPU_OPT_BITS_RANDOM} \
 	gthr.h \
 	gthr-default.h \
-- 
2.41.0