about summary refs log tree commit diff
path: root/sysdeps/s390
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@sourceware.org>2021-06-07 14:22:20 +0530
committerSiddhesh Poyarekar <siddhesh@sourceware.org>2021-06-09 09:47:16 +0530
commitfc5bfade69ca12d034967dc6b929dbe3dd715172 (patch)
tree841bee58b3ec3c8f8203992fa0f94d7f125885a3 /sysdeps/s390
parentb17d29b390154df9dfad9d21f1e6605422521fd2 (diff)
downloadglibc-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 'sysdeps/s390')
-rw-r--r--sysdeps/s390/Makefile16
-rw-r--r--sysdeps/s390/gconv-modules-s390.conf (renamed from sysdeps/s390/gconv-modules)0
2 files changed, 14 insertions, 2 deletions
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
index a8c49c928f..ade8663218 100644
--- a/sysdeps/s390/Makefile
+++ b/sysdeps/s390/Makefile
@@ -21,13 +21,25 @@ lib := iconvdata
 include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
 
 extra-objs      += $(addsuffix .so, $(s390x-iconv-modules))
-install-others  += $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules))
+install-others  += $(patsubst %, $(inst_gconvdir)/%.so, \
+				 $(s390x-iconv-modules)) \
+		   $(inst_gconvdir)/gconv-modules.d/gconv-modules-s390.conf
 
 $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules)) : \
 $(inst_gconvdir)/%.so: $(objpfx)%.so $(+force)
 	$(do-install-program)
 
-sysdeps-gconv-modules = ../sysdeps/s390/gconv-modules
+ifdef objpfx
+generated += gconv-modules.d/gconv-modules-s390.conf
+endif
+
+$(inst_gconvdir)/gconv-modules.d/gconv-modules-s390.conf: \
+		$(modpfx)gconv-modules-s390.conf $(+force)
+	$(do-install)
+
+$(modpfx)gconv-modules-s390.conf: ../sysdeps/s390/gconv-modules-s390.conf \
+				  $(modpfx)
+	cp $< $@
 endif
 
 ifeq ($(subdir),elf)
diff --git a/sysdeps/s390/gconv-modules b/sysdeps/s390/gconv-modules-s390.conf
index 8f210a0882..8f210a0882 100644
--- a/sysdeps/s390/gconv-modules
+++ b/sysdeps/s390/gconv-modules-s390.conf