[svn-commits] kpfleming: branch group/new_loader_completion r40691 - in /team/group/new_loa...

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sun Aug 20 16:38:58 2006
New Revision: 40691

URL: http://svn.digium.com/view/asterisk?rev=40691&view=rev
Log:
use config.guess platform name for Darwin

Modified:
    team/group/new_loader_completion/Makefile
    team/group/new_loader_completion/main/Makefile

Modified: team/group/new_loader_completion/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/Makefile?rev=40691&r1=40690&r2=40691&view=diff
==============================================================================
--- team/group/new_loader_completion/Makefile (original)
+++ team/group/new_loader_completion/Makefile Sun Aug 20 16:38:58 2006
@@ -150,7 +150,7 @@
   ASTCFLAGS+=-Werror -Wunused
 endif
 
-ifeq ($(findstring BSD,$(OSARCH)),BSD)
+ifneq ($(findstring BSD,$(OSARCH)),)
   ASTCFLAGS+=-I/usr/local/include -L/usr/local/lib
 endif
 
@@ -209,14 +209,14 @@
 MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
 MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
 
-ifeq ($(OSARCH),Darwin)
+ifneq ($(findstring darwin,$(OSARCH)),)
   ASTCFLAGS+=-D__Darwin__
   AUDIO_LIBS=-framework CoreAudio
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
 else
 # These are used for all but Darwin
   SOLINK=-shared -Xlinker -x
-  ifeq ($(findstring BSD,$(OSARCH)),BSD)
+  ifneq ($(findstring BSD,$(OSARCH)),)
     LDFLAGS+=-L/usr/local/lib
   endif
 endif

Modified: team/group/new_loader_completion/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/main/Makefile?rev=40691&r1=40690&r2=40691&view=diff
==============================================================================
--- team/group/new_loader_completion/main/Makefile (original)
+++ team/group/new_loader_completion/main/Makefile Sun Aug 20 16:38:58 2006
@@ -60,7 +60,7 @@
   AST_LIBS+=$(EDITLINE_LIB) -lm
 endif
 
-ifeq ($(OSARCH),Darwin)
+ifneq ($(findstring darwin,$(OSARCH)),)
   AST_LIBS+=-lresolv
   ASTLINK=-Wl,-dynamic
   # Mac on Intel CoreDuo does not need poll compatibility layer
@@ -71,7 +71,7 @@
 else
 # These are used for all but Darwin
   ASTLINK=-Wl,-E 
-  ifeq ($(findstring BSD,$(OSARCH)),BSD)
+  ifneq ($(findstring BSD,$(OSARCH)),)
     LDFLAGS+=-L/usr/local/lib
   endif
 endif