Explorar el Código

make menuconfig color fix for Darwin users

Prefer ncurses from Darwin base before brew installed ncurses.
It seems brew ncurses have some issues with colors.
Waldemar Brodkorb hace 7 años
padre
commit
67ee55eaa0
Se han modificado 1 ficheros con 4 adiciones y 4 borrados
  1. 4 4
      adk/config/Makefile

+ 4 - 4
adk/config/Makefile

@@ -29,6 +29,10 @@ ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h))
 HOST_CFLAGS+=	-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
 LIBS+=		-lncurses
 else
+ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
+HOST_CFLAGS+=	-DCURSES_LOC="<ncurses.h>"
+LIBS+=		-lncurses
+else
 ifeq (/usr/local/include/ncurses/ncurses.h, $(wildcard /usr/local/include/ncurses/ncurses.h))
 HOST_CFLAGS+=	-I/usr/local/include/ncurses -DCURSES_LOC="<ncurses.h>"
 LIBS+=		-lncurses
@@ -45,10 +49,6 @@ ifeq (/usr/pkg/include/ncurses.h, $(wildcard /usr/pkg/include/ncurses.h))
 HOST_CFLAGS+=	-I/usr/pkg/include -DCURSES_LOC="<ncurses.h>"
 LIBS+=		-L/usr/pkg/lib -Wl,-rpath -Wl,/usr/pkg/lib -lncurses
 else
-ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
-HOST_CFLAGS+=	-DCURSES_LOC="<ncurses.h>"
-LIBS+=		-lncurses
-else
 HOST_CFLAGS+=	-DCURSES_LOC="<curses.h>"
 LIBS=		-lcurses
 endif