Correct building locales and backport the changes

Makefile

@@ -346,7 +346,6 @@ defconfig: extra/config/conf
 clean:
 	@$(RM) -r lib include/bits
 	$(RM) libc/*.a libc/obj.* libc/nonshared_obj.*
-	$(RM) libc/misc/locale/locale_data.c
 	$(RM) libc/misc/internals/interp.c
 	$(RM) ldso/libdl/*.a
 	$(RM) include/fpu_control.h include/dl-osinfo.h

Makefile.in

@@ -343,7 +343,6 @@ defconfig: extra/config/conf
 clean:
 	@$(RM) -r lib include/bits
 	$(RM) lib*/*.a ldso/*/*.a libpthread/*/*.a
-	$(RM) libc/misc/locale/locale_data.c
 	$(RM) libc/misc/internals/interp.c
 	$(RM) include/fpu_control.h include/dl-osinfo.h
 	$(MAKE) -C extra/locale clean

libc/misc/locale/Makefile

@@ -57,11 +57,10 @@ $(MOBJ): $(MSRC)
 $(MOBJx): $(MSRC)
 	$(CC) $(CFLAGS) -DL_$* -D__UCLIBC_DO_XLOCALE $< -c -o $*.o
 
-locale_data.o:
-	$(LN) -sf ../../../extra/locale/locale_data.c
-	$(CC) $(CFLAGS) -c -D__WCHAR_ENABLED -I../../../extra/locale locale_data.c -o $@
+locale_data.o: ../../../extra/locale/locale_data.c
+	$(CC) $(CFLAGS) -c -D__WCHAR_ENABLED -I$(notdir $<) $< -o $@
 
 clean:
-	$(RM) *.o *~ core locale_data.c
+	$(RM) *.o *~ core
 
 .PHONY: data

libc/misc/locale/Makefile.in

@@ -40,13 +40,13 @@ $(MISC_LOCALE_MOBJx) $(MISC_LOCALE_MOBJx:.o=.os): $(MISC_LOCALE_MSRC)
 	$(compile.m) -D__UCLIBC_DO_XLOCALE
 
 $(MISC_LOCALE_DATA) $(MISC_LOCALE_DATA:.o=.os): $(top_builddir)extra/locale/$(notdir $(MISC_LOCALE_DATA:.o=.c))
-	$(compile.c) -D__WCHAR_ENABLED -I$<
+	$(compile.c) -D__WCHAR_ENABLED -I$(dir $<)
 
 libc-a-y+=$(MISC_LOCALE_MOBJ)
+libc-a-$(UCLIBC_HAS_LOCALE)+=$(MISC_LOCALE_DATA)
 libc-a-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx)
-libc-a-pic-y+=$(MISC_LOCALE_MOBJ:.o=.os)
-libc-a-pic-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx:.o=.os)
 libc-so-y+=$(MISC_LOCALE_MOBJ:.o=.os)
+libc-so-$(UCLIBC_HAS_LOCALE)+=$(MISC_LOCALE_DATA:.o=.os)
 libc-so-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx:.o=.os)
 
 #CFLAGS-multi-y+=$(MISC_LOCALE_DEF)