From b21c0d1bcea84e7c2f33cfe7afbc7044a74726fa Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Fri, 18 Sep 2009 00:39:12 +0000 Subject: [PATCH] 2009-09-18 02:38 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/detect.mk ! fixed typo in include directory used for slang.h detection - removed redundant HB_LOCAL_SLN variable - now this functionality can be reached using HB_INC_SLANG --- harbour/ChangeLog | 6 ++++++ harbour/config/detect.mk | 12 ++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0609e52693..296a8b5c01 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-18 02:38 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/config/detect.mk + ! fixed typo in include directory used for slang.h detection + - removed redundant HB_LOCAL_SLN variable - now this functionality + can be reached using HB_INC_SLANG + 2009-09-18 01:43 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbthread.h * harbour/include/hbdefs.h diff --git a/harbour/config/detect.mk b/harbour/config/detect.mk index 8098cf8434..8ac2c4d138 100644 --- a/harbour/config/detect.mk +++ b/harbour/config/detect.mk @@ -100,14 +100,10 @@ _DET_FLT_COMP := _DET_INC_DEFP := _DET_INC_HEAD := /slang.h -ifeq ($(HB_LOCAL_SLN),yes) - _DET_INC_DEFP += /usr/local/include /usr/local/include/slang -else - _DET_INC_DEFP += /usr/include /usr/include/slang - _DET_INC_DEFP += /usr/usr/local/include /usr/local/include/slang - _DET_INC_DEFP += /sw/include /sw/include/slang - _DET_INC_DEFP += /opt/local/include /opt/local/include/slang -endif +_DET_INC_DEFP += /usr/include /usr/include/slang +_DET_INC_DEFP += /usr/local/include /usr/local/include/slang +_DET_INC_DEFP += /sw/include /sw/include/slang +_DET_INC_DEFP += /opt/local/include /opt/local/include/slang include $(TOP)$(ROOT)config/detfun.mk