Merge with master

[tig] / Makefile

diff --git a/Makefile b/Makefile
index 0b970d9..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
@@ -24,6 +24,7 @@ all-debug: CFLAGS += $(DFLAGS)
 doc: $(DOCS)
 
 install: all
+       mkdir -p $(DESTDIR)$(bindir) && \
        for prog in $(PROGS); do \
                install $$prog $(DESTDIR)$(bindir); \
        done