Merge with master

[tig] / Makefile

diff --git a/Makefile b/Makefile
index 9d8c57b..0052abd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ mandir = $(prefix)/man
 docdir = $(prefix)/share/doc
 # DESTDIR=
 
-LDLIBS  = -lcurses
+LDLIBS  = -lcurses -liconv
 CFLAGS = -Wall -O2
 DFLAGS = -g -DDEBUG -Werror
 PROGS  = tig