Merge branch 'dp/makefile-charset-lib-doc'

gitster · gitster · commit a79cbc136850 · 2014-03-31T16:30:57.000-07:00
* dp/makefile-charset-lib-doc:
  Makefile: describe CHARSET_LIB better
diff --git a/Makefile b/Makefile
@@ -59,9 +59,9 @@ all::
 # FreeBSD can use either, but MinGW and some others need to use
 # libcharset.h's locale_charset() instead.
 #
-# Define CHARSET_LIB to you need to link with library other than -liconv to
+# Define CHARSET_LIB to the library you need to link with in order to
 # use locale_charset() function.  On some platforms this needs to set to
-# -lcharset
+# -lcharset, on others to -liconv .
 #
 # Define LIBC_CONTAINS_LIBINTL if your gettext implementation doesn't
 # need -lintl when linking.

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,9 @@ all::`
`59`	`59`	`# FreeBSD can use either, but MinGW and some others need to use`
`60`	`60`	`# libcharset.h's locale_charset() instead.`
`61`	`61`	`#`
`62`		`-# Define CHARSET_LIB to you need to link with library other than -liconv to`
	`62`	`+# Define CHARSET_LIB to the library you need to link with in order to`
`63`	`63`	`# use locale_charset() function. On some platforms this needs to set to`
`64`		`-# -lcharset`
	`64`	`+# -lcharset, on others to -liconv .`
`65`	`65`	`#`
`66`	`66`	`# Define LIBC_CONTAINS_LIBINTL if your gettext implementation doesn't`
`67`	`67`	`# need -lintl when linking.`