diff options
| author | planetmaker <planetmaker@openttd.org> | 2015-12-15 20:43:39 +0000 |
|---|---|---|
| committer | planetmaker <planetmaker@openttd.org> | 2015-12-15 20:43:39 +0000 |
| commit | e78ce08287d443a83828372d284dfc55b78ac633 (patch) | |
| tree | 5bb81bf090d01ac814deec88ae7dfaf9d016ba13 | |
| parent | 3db1137836884dd2f689cc2c1ea1ac48192c2b35 (diff) | |
| download | openttd-e78ce08287d443a83828372d284dfc55b78ac633.tar.xz | |
(svn r27472) -Change [FS#6401] (r20219): On Haiku use the appropriate system variable to obtain the include dir (aarroyoc)
| -rw-r--r-- | config.lib | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config.lib b/config.lib index 07985a4f8..a8c6e129c 100644 --- a/config.lib +++ b/config.lib @@ -2610,10 +2610,13 @@ detect_library() { fi fi if [ -z "$res" ] && [ "$os" = "HAIKU" ]; then - eval "$2=`ls -1 /boot/common/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`" + if [ -z "$includeDir" ]; then + includeDir=`finddir B_SYSTEM_HEADERS_DIRECTORY` + fi + eval "$2=`ls -1 $includeDir/$4*.h 2>/dev/null | egrep \"\/$5\$\"`" eval "res=\$$2" if [ -z "$res" ]; then - log 2 " trying /boot/common/include/$4$5... no" + log 2 " trying $includeDir/$4$5... no" fi fi |