From 6aa6819c41b7c95876e0af86b5598ce7a5be989d Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Sat, 11 Feb 2006 17:12:05 +0000
Subject: use auto-build for apps, simplify variable setting

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9564 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 res/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/Makefile b/res/Makefile
index bbbabf396..01cdc4017 100644
--- a/res/Makefile
+++ b/res/Makefile
@@ -3,7 +3,7 @@
 # 
 # Makefile for resource modules
 #
-# Copyright (C) 1999-2005, Digium
+# Copyright (C) 1999-2006, Digium
 #
 # Mark Spencer <markster@digium.com>
 #
@@ -13,7 +13,7 @@
 
 MODS:=$(patsubst %.c,%.so,$(wildcard res_*.c))
 
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
   MODS:=$(filter-out res_odbc.so,$(MODS))
   MODS:=$(filter-out res_config_odbc.so,$(MODS))
 else
@@ -26,7 +26,7 @@ ifneq ($(NOCRYPTO),yes)
   MODS:=$(filter-out res_crypto.so,$(MODS))
 endif
 
-OSPLIB=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a)
+OSPLIB:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a)
 ifeq (${OSPLIB},)
   MODS:=$(filter-out res_osp.so,$(MODS))
 endif
-- 
cgit v1.2.3