From 8da9efaa2894d02a7ff9b5d9707c711d909e904d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 21 Oct 2014 21:52:07 +0200
Subject: allow to build with MacOS X Yosemite and Homebrew.

---
 adk/config/Makefile   | 5 +++++
 mk/vars.mk            | 6 +++---
 scripts/scan-tools.sh | 8 +++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/adk/config/Makefile b/adk/config/Makefile
index 8eb45f5c0..7e91da1bf 100644
--- a/adk/config/Makefile
+++ b/adk/config/Makefile
@@ -27,6 +27,10 @@ else
 ifeq (/usr/local/include/ncurses/curses.h, $(wildcard /usr/local/include/ncurses/curses.h))
 HOST_CFLAGS+=	-I/usr/local/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
 else
+ifeq (/usr/local/opt/ncurses/include/ncursesw/ncurses.h, $(wildcard /usr/local/opt/ncurses/include/ncursesw/ncurses.h))
+HOST_CFLAGS+=	-I/usr/local/opt/ncurses/include -DCURSES_LOC="<ncursesw/ncurses.h>"
+LIBS+=		-L/usr/local/opt/ncurses/lib -Wl,-rpath -Wl,/usr/local/opt/ncurses/lib
+else
 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
@@ -42,6 +46,7 @@ endif
 endif
 endif
 endif
+endif
 
 CONF_SRC  =conf.c
 MCONF_SRC =mconf.c $(wildcard lxdialog/*.c)
diff --git a/mk/vars.mk b/mk/vars.mk
index 0e699a9b9..1d36b633e 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -273,9 +273,9 @@ PKG_INSTALL:=		PATH='${HOST_PATH}' \
 			-force-defaults -force-depends install
 PKG_STATE_DIR:=		$(TARGET_DIR)/usr/lib/ipkg
 else
-PKG_BUILD:=		${BASH} ${SCRIPT_DIR}/tarpkg build
-PKG_INSTALL:=		PKG_INSTROOT=$(TARGET_DIR) \
-			${BASH} ${SCRIPT_DIR}/tarpkg install
+PKG_BUILD:=		PATH='${HOST_PATH}' ${BASH} ${SCRIPT_DIR}/tarpkg build
+PKG_INSTALL:=		PKG_INSTROOT='$(TARGET_DIR)' \
+			PATH='${HOST_PATH}' ${BASH} ${SCRIPT_DIR}/tarpkg install
 PKG_STATE_DIR:=		$(TARGET_DIR)/usr/lib/pkg
 endif
 
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 93cd1dd70..8654d0d07 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -157,9 +157,11 @@ fi
 if [[ ! -s /usr/include/ncurses.h ]]; then
 	if [[ ! -s /usr/include/curses.h ]]; then
 		if [[ ! -s /usr/include/ncurses/ncurses.h ]]; then
-			echo Install ncurses header files, please.
-			echo
-			out=1
+			if [[ ! -s /usr/local/opt/ncurses/include/ncursesw/ncurses.h ]]; then
+				echo Install ncurses header files, please.
+				echo
+				out=1
+			fi
 		fi
 	fi
 fi
-- 
cgit v1.2.3