diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-06-30 17:15:19 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-06-30 17:15:19 +0000 |
| commit | d8d5a6478eef73ad71000bedee214b85affc15ed (patch) | |
| tree | d6f32249f0b459654a6a2ebfd63896647ef56915 /iconvdata | |
| parent | 9d0c92b26dbe3e29afd9d0ea8979cc0a16dcc49b (diff) | |
| download | glibc-d8d5a6478eef73ad71000bedee214b85affc15ed.zip glibc-d8d5a6478eef73ad71000bedee214b85affc15ed.tar.gz glibc-d8d5a6478eef73ad71000bedee214b85affc15ed.tar.bz2 | |
Update.
* iconvdata/Makefile: Recreate gconv-modules.cache file in taret
directory if it existed before.
* iconv/iconvconfig.c: Implement --prefix option.
Diffstat (limited to 'iconvdata')
| -rw-r--r-- | iconvdata/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile index 20281ec..aeb4ff9 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -279,6 +279,14 @@ $(addprefix $(inst_gconvdir)/, $(modules.so)): \ $(do-install-program) $(inst_gconvdir)/gconv-modules: gconv-modules $(+force) $(do-install) +# 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 endif # build-shared = yes |