Fixed r372696 when configured --disable-asteriskssl; properly install libasteriskssl...
authorDavid M. Lee <dlee@digium.com>
Wed, 12 Sep 2012 14:22:54 +0000 (14:22 +0000)
committerDavid M. Lee <dlee@digium.com>
Wed, 12 Sep 2012 14:22:54 +0000 (14:22 +0000)
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

main/Makefile

index 5ec9b8f..a287e13 100644 (file)
@@ -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