mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
Fix for installation in sysdeps/s390/s390-64/Makefile
This commit is contained in:
parent
ecaddd6699
commit
c0cfb5eb3d
@ -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]
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user