Fix for installation in sysdeps/s390/s390-64/Makefile

This commit is contained in:
Ulrich Drepper 2011-07-06 21:38:49 -04:00
parent ecaddd6699
commit c0cfb5eb3d
2 changed files with 17 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2011-06-21 Andreas Jaeger <aj@suse.de>
* sysdeps/s390/s390-64/Makefile ($(inst_gconvdir)/gconv-modules):
Copy rule from iconvdata/Makefile.
2011-07-06 Ulrich Drepper <drepper@gmail.com>
[BZ #12922]

View File

@ -74,5 +74,17 @@ $(objpfx)gconv-modules-s390: gconv-modules $(+force)
$(inst_gconvdir)/gconv-modules: $(objpfx)gconv-modules-s390 $(+force)
$(do-install)
ifeq (no,$(cross-compiling))
# Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary
# if this libc has more gconv modules than the previously installed one.
if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \
LC_ALL=C LANGUAGE=C \
$(common-objpfx)elf/ld.so --library-path $(rpath-link) \
$(common-objpfx)iconv/iconvconfig \
$(addprefix --prefix=,$(install_root)); \
fi
else
@echo '*@*@*@ You should recreate $(inst_gconvdir)/gconv-modules.cache'
endif
endif