Skip to content

Commit f87976e

Browse files
committed
Doc tweaks.
1 parent b3a9de1 commit f87976e

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

ChangeLog

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2018-03-27 Bruno Haible <bruno@clisp.org>
2+
3+
Doc tweaks.
4+
* README: Don't recommend to use --prefix=/usr/local, as it produces
5+
problems with GCC (since GCC's treatment of /usr/local/include and
6+
/usr/local/lib is inconsistent by default). Don't recommend to use
7+
the iconv.m4 installed by GNU gettext, because it won't work when
8+
GNU automake and GNU gettext are installed with different --prefix
9+
options; instead recommend the 'iconv' module from gnulib.
10+
111
2018-01-27 Bruno Haible <bruno@clisp.org>
212

313
Rename some files.

README

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Installation
9090

9191
As usual for GNU packages:
9292

93-
$ ./configure --prefix=/usr/local
93+
$ ./configure --prefix=[[PREFIX]] where [[PREFIX]] is e.g. $HOME/local
9494
$ make
9595
$ make install
9696

@@ -125,8 +125,8 @@ This library can be built and installed in two variants:
125125
the functions the placeholder @LIBICONV@ (or, if using libtool for
126126
the link, @LTLIBICONV@). If you use automake, the right place for
127127
these additions are the *_LDADD variables.
128-
Note that 'iconv.m4' is also part of the GNU gettext package, which
129-
installs it in /usr/local/share/aclocal/iconv.m4.
128+
Note that 'iconv.m4' is also part of GNU gnulib, available through
129+
the gnulib module 'iconv'.
130130

131131
- The libc plug/override mode. This works on GNU/Linux, Solaris and OSF/1
132132
systems only. It is a way to get good iconv support without having
@@ -135,10 +135,10 @@ This library can be built and installed in two variants:
135135
with LD_PRELOAD, to override the iconv* functions present in the C library.
136136

137137
On GNU/Linux and Solaris:
138-
$ export LD_PRELOAD=/usr/local/lib/preloadable_libiconv.so
138+
$ export LD_PRELOAD=[[PREFIX]]/lib/preloadable_libiconv.so
139139

140140
On OSF/1:
141-
$ export _RLD_LIST=/usr/local/lib/preloadable_libiconv.so:DEFAULT
141+
$ export _RLD_LIST=[[PREFIX]]/lib/preloadable_libiconv.so:DEFAULT
142142

143143
A program's source need not be modified, the program need not even be
144144
recompiled. Just set the LD_PRELOAD environment variable, that's it!

0 commit comments

Comments
 (0)