diff options
| author | David M. Lee <dlee@digium.com> | 2012-09-12 14:22:54 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2012-09-12 14:22:54 +0000 |
| commit | 5e84558123282a174ac1c87c74ba77cb15631bfc (patch) | |
| tree | a566e4ec58cf1caef2206c5da5a4023bb00c675d /main/Makefile | |
| parent | 6f8bad0eace50f04f41e6db2d6a7d4de6dcdce6d (diff) | |
Fixed r372696 when configured --disable-asteriskssl; properly install libasteriskssl.dylib on OS X.
I didn't realize that libasteriskssl.c was still compiled, even when you
disable asteriskssl; it simple gets statically linked into asterisk.
........
Merged revisions 372930 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@372931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile index 5ec9b8fe0..a287e1333 100644 --- a/main/Makefile +++ b/main/Makefile @@ -187,6 +187,8 @@ endif $(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\" +libasteriskssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE) + ifeq ($(AST_ASTERISKSSL),yes) # The ABI *version* of the asteriskssl library; don't change this unless there truly is a # non-backwards-compatible ABI change in the library @@ -194,8 +196,6 @@ ASTSSL_SO_VERSION=1 ASTSSL_LDLIBS=-L. -lasteriskssl -libasteriskssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE) - ifeq ($(findstring darwin,$(OSARCH)),) # not Darwin ASTSSL_LIB:=libasteriskssl.so @@ -257,8 +257,12 @@ endif bininstall: $(INSTALL) -m 755 $(MAIN_TGT) "$(DESTDIR)$(ASTSBINDIR)/" ifeq ($(AST_ASTERISKSSL),yes) +ifeq ($(findstring darwin,$(OSARCH)),) # not Darwin $(INSTALL) -m 755 $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) "$(DESTDIR)$(ASTLIBDIR)/" $(LN) -sf "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB).$(ASTSSL_SO_VERSION)" "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB)" +else # Darwin + $(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(ASTLIBDIR)/" +endif ifneq ($(LDCONFIG),) $(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/" endif |