From 6c4474b4d35ff9c5779cd79e51c95bc106d7f67e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 13 Jul 2009 23:28:42 +0000 Subject: [PATCH] 2009-07-14 01:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/gtcrs/Makefile * source/rtl/gtsln/Makefile * Detection locations synced with make_gnu.sh. (not 100%, ncurses.h isn't checked for existence in Makefile, as it's not used anyway in our sources. should be removed from make_gnu.sh probably.) --- harbour/ChangeLog | 8 ++++++++ harbour/source/rtl/gtcrs/Makefile | 4 ++-- harbour/source/rtl/gtsln/Makefile | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ef257c4578..cff4ec7ca5 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-14 01:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * source/rtl/gtcrs/Makefile + * source/rtl/gtsln/Makefile + * Detection locations synced with make_gnu.sh. + (not 100%, ncurses.h isn't checked for existence in Makefile, + as it's not used anyway in our sources. should be removed from + make_gnu.sh probably.) + 2009-07-14 00:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL + Added Linux build on NT host example. diff --git a/harbour/source/rtl/gtcrs/Makefile b/harbour/source/rtl/gtcrs/Makefile index b32e478e7f..c0aa7b5af6 100644 --- a/harbour/source/rtl/gtcrs/Makefile +++ b/harbour/source/rtl/gtcrs/Makefile @@ -14,13 +14,13 @@ ifeq ($(HB_XBUILD),) ifeq ($(HB_NCURSES_194),yes) HB_INC_CURSES = /usr/include/ncur194 else -HB_INC_CURSES = /usr/include/ncurses /sw/include /sw/include/ncurses +HB_INC_CURSES = /usr/include /usr/include/ncurses /usr/local/include /usr/local/include/ncurses /sw/include /sw/include/ncurses /opt/local/include /opt/local/include/ncurses endif endif endif ifeq ($(HB_WITHOUT_GTCRS),yes) -#HB_INC_CURSES = +HB_INC_CURSES = endif HB_INC_CURSES_OK += $(foreach d, $(HB_INC_CURSES), $(if $(wildcard $(d)/curses.h),$(d),)) diff --git a/harbour/source/rtl/gtsln/Makefile b/harbour/source/rtl/gtsln/Makefile index 4e1753d8ae..4e256a91c0 100644 --- a/harbour/source/rtl/gtsln/Makefile +++ b/harbour/source/rtl/gtsln/Makefile @@ -17,7 +17,7 @@ ifeq ($(HB_LOCAL_SLN),yes) HB_INC_SLANG = /usr/local/include /usr/local/include/slang LDFLAGS := -L/usr/local/lib $(LDFLAGS) else -HB_INC_SLANG = /usr/include/slang /usr/local/include /usr/local/include/slang /sw/include /opt/local/include +HB_INC_SLANG = /usr/include /usr/include/slang /usr/local/include /usr/local/include/slang /sw/include /sw/include/slang /opt/local/include /opt/local/include/slang LDFLAGS := -L/usr/lib/slang -L/usr/local/lib -L/usr/local/lib/slang $(LDFLAGS) endif endif