Merge branch 'es/make-no-iconv'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 18:23:24 +0000 (11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 18:23:24 +0000 (11:23 -0700)
commitda34dd49bb8c9bdab5bf98f463d5b3453976db9b
tree70e6c99b288f07183c32b13e3b9758d2e491b03d
parentcc2beafc4bcdbb3fa4b9c9434704c4ba30e0f147
parentfdb1fbbc7d313253ca9fac5b0be3d0573dcb5419
Merge branch 'es/make-no-iconv'

"make NO_ICONV=NoThanks" did not override NEEDS_LIBICONV
(i.e. linkage of -lintl, -liconv, etc. that are platform-specific
tweaks), which has been corrected.

* es/make-no-iconv:
  Makefile: make NO_ICONV really mean "no iconv"
Makefile