Merge remote-tracking branch 'somasis/master'

This commit is contained in:
Maxime Coste 2015-11-21 15:39:27 +00:00
commit b0d696d994

View File

@ -24,6 +24,8 @@ deps := $(addprefix ., $(sources:.cc=$(suffix).d))
PREFIX ?= /usr/local PREFIX ?= /usr/local
DESTDIR ?= # root dir DESTDIR ?= # root dir
NCURSESW_INCLUDE ?= /usr/include/ncursesw
bindir := $(DESTDIR)$(PREFIX)/bin bindir := $(DESTDIR)$(PREFIX)/bin
sharedir := $(DESTDIR)$(PREFIX)/share/kak sharedir := $(DESTDIR)$(PREFIX)/share/kak
docdir := $(DESTDIR)$(PREFIX)/share/doc/kak docdir := $(DESTDIR)$(PREFIX)/share/doc/kak
@ -46,7 +48,7 @@ else ifneq (,$(findstring CYGWIN,$(os)))
LIBS += -lncursesw -lboost_regex -ldbghelp LIBS += -lncursesw -lboost_regex -ldbghelp
else else
LIBS += -lncursesw -lboost_regex LIBS += -lncursesw -lboost_regex
CPPFLAGS += -I/usr/include/ncursesw CPPFLAGS += -I$(NCURSESW_INCLUDE)
LDFLAGS += -rdynamic LDFLAGS += -rdynamic
endif endif