summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-31 16:30:57 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-31 16:30:57 -0700
commita79cbc1368505bc02639b1b423a1132324cb5853 (patch)
tree0f223092895ff11c9043dcfb9972383a33e6dd5e /Makefile
parentc228a5c077d564d84e52fb1aabf3d623230c894d (diff)
parent3064b13053ebf8e629da3024e33550c53f64dfd2 (diff)
downloadgit-a79cbc1368505bc02639b1b423a1132324cb5853.tar.gz
Merge branch 'dp/makefile-charset-lib-doc'
* dp/makefile-charset-lib-doc: Makefile: describe CHARSET_LIB better
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 36463919af..c5316a34ac 100644
--- 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.