diff options
| author | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-06-07 14:22:20 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-06-09 09:47:16 +0530 |
| commit | fc5bfade69ca12d034967dc6b929dbe3dd715172 (patch) | |
| tree | 841bee58b3ec3c8f8203992fa0f94d7f125885a3 /localedata | |
| parent | b17d29b390154df9dfad9d21f1e6605422521fd2 (diff) | |
| download | glibc-fc5bfade69ca12d034967dc6b929dbe3dd715172.tar.gz glibc-fc5bfade69ca12d034967dc6b929dbe3dd715172.tar.xz glibc-fc5bfade69ca12d034967dc6b929dbe3dd715172.zip | |
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 <dj@redhat.com>
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/localedata/Makefile b/localedata/Makefile index 14e04cd3c5..364d7c758d 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 $@ |