From fc5bfade69ca12d034967dc6b929dbe3dd715172 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Mon, 7 Jun 2021 14:22:20 +0530 Subject: iconvdata: Move gconv-modules configuration to gconv-modules.conf Move all gconv-modules configuration files to gconv-modules.conf. That is, the S390 extensions now become gconv-modules-s390.conf. Move both configuration files into gconv-modules.d. Now GCONV_PATH/gconv-modules is read only for backward compatibility for third-party gconv modules directories. Reviewed-by: DJ Delorie --- localedata/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'localedata') diff --git a/localedata/Makefile b/localedata/Makefile index 14e04cd..364d7c7 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -183,7 +183,7 @@ install-others := $(addprefix $(inst_i18ndir)/, \ $(locales)) endif -tests: $(objdir)/iconvdata/gconv-modules +tests: $(objdir)/iconvdata/gconv-modules.d/gconv-modules.conf tests-static += tst-langinfo-newlocale-static tst-langinfo-setlocale-static @@ -464,5 +464,5 @@ $(objpfx)mtrace-tst-leaks.out: $(objpfx)tst-leaks.out bug-setlocale1-ENV-only = LOCPATH=$(objpfx) LC_CTYPE=de_DE.UTF-8 bug-setlocale1-static-ENV-only = $(bug-setlocale1-ENV-only) -$(objdir)/iconvdata/gconv-modules: +$(objdir)/iconvdata/gconv-modules.d/gconv-modules.conf: $(MAKE) -C ../iconvdata subdir=iconvdata $@ -- cgit v1.1