diff options
| author | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-06-14 11:09:56 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2021-06-14 18:38:09 +0530 |
| commit | 06a1b794073c4d6adbfb2e4b11339985a14d7a00 (patch) | |
| tree | 33206526aafcc2bcc3bf9e88066085359cf5b123 /localedata | |
| parent | ebae2f5a6f971a8f0b6c99e00f9c45ef7433924a (diff) | |
| download | glibc-06a1b794073c4d6adbfb2e4b11339985a14d7a00.tar.gz glibc-06a1b794073c4d6adbfb2e4b11339985a14d7a00.tar.xz glibc-06a1b794073c4d6adbfb2e4b11339985a14d7a00.zip | |
Reinstate gconv-modules as the default configuration file
Reinstate gconv-modules as the main file so that the configuration files in gconv-modules.d/ become add-on configuration. With this, the effective user visible change is that GCONV_PATH can now have supplementary configuration in GCONV_PATH/gconv-modules.d/ in addition to the main GCONV_PATH/gconv-modules file.
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 364d7c758d..14e04cd3c5 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -183,7 +183,7 @@ install-others := $(addprefix $(inst_i18ndir)/, \ $(locales)) endif -tests: $(objdir)/iconvdata/gconv-modules.d/gconv-modules.conf +tests: $(objdir)/iconvdata/gconv-modules 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.d/gconv-modules.conf: +$(objdir)/iconvdata/gconv-modules: $(MAKE) -C ../iconvdata subdir=iconvdata $@ |