aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authoroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-03 11:11:15 +0000
committeroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-03 11:11:15 +0000
commit76f7d4f24ddd5f41cdc31e5fb76e85bab8ad9a72 (patch)
treee6f64a4639b4df80d85f1d222e0b59d7732a0c50 /Makefile
parent21f12d5255b43467347529a8c0a135f54a58cef1 (diff)
Merged revisions 227088 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r227088 | oej | 2009-11-03 11:29:59 +0100 (Tis, 03 Nov 2009) | 7 lines Use proper response code when violating Contact ACL's. https://reviewboard.asterisk.org/r/415/ Thanks kpfleming for a quick review. (EDVX-003) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@227091 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index dceb86074..784e9a7ac 100644
--- a/Makefile
+++ b/Makefile
@@ -306,7 +306,7 @@ MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
ifneq ($(findstring darwin,$(OSARCH)),)
_ASTCFLAGS+=-D__Darwin__
SOLINK=-bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace /usr/lib/bundle1.o
- _ASTLDFLAGS+= /usr/lib/bundle1.o -L/usr/local/lib
+ _ASTLDFLAGS+= -L/usr/local/lib
else
# These are used for all but Darwin
SOLINK=-shared