]> Sergey Matveev's repositories - nnn.git/commitdiff
pkg-config for ncurses (#25)
authorJohnathan Jenkins <john@nixheads.co.uk>
Sat, 13 May 2017 16:33:08 +0000 (09:33 -0700)
committerArun Prakash Jana <engineerarun@gmail.com>
Sat, 13 May 2017 16:33:08 +0000 (22:03 +0530)
Makefile
nnn.c

index 69e19e3e2cbf93e6bb3df562a20420f2adc9dd97..efd9555a355332717073b078bd5f260cfe129b11 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,15 @@ MANPREFIX = $(PREFIX)/share/man
 
 CFLAGS += -O3 -march=native -Wall -Wextra -Wno-unused-parameter
 LDLIBS = -lreadline
-ifeq ($(shell uname), Darwin)
-    LDLIBS += -lncurses
+
+ifeq ($(shell pkg-config ncursesw && echo 1),1)
+       CFLAGS += $(shell pkg-config --cflags ncursesw)
+       LDLIBS += $(shell pkg-config --libs   ncursesw)
 else
-    LDLIBS += -lncursesw
+       LDLIBS += -lncurses
 endif
 
+
 DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE
 LOCALCONFIG = config.h
 SRC = nnn.c
diff --git a/nnn.c b/nnn.c
index cedaff199a81b18eb562e34c53a6ccbf30b11040..1bd9a6702e23caf635af23f097033852f15fd47e 100644 (file)
--- a/nnn.c
+++ b/nnn.c
@@ -6,11 +6,7 @@
 #include <sys/resource.h>
 
 #include <ctype.h>
-#ifdef __linux__
-#include <ncursesw/curses.h>
-#else
 #include <curses.h>
-#endif
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>