kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "pjproject_bundled: Fix use of LDCONFIG for shared library link creation" into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-03-31 12:35:49 -05:00
committed by Gerrit Code Review
parent cb9b7f6b1b 964f54bd5d
commit b602886c6b
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main/Makefile
View File

@@ -224,11 +224,11 @@ endif
$(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION)
$(ECHO_PREFIX) echo " [LN] $< -> $@"
ifneq ($(LDCONFIG),)
$(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null
else
$(CMD_PREFIX) $(LN) -sf $< $@
endif
$(CMD_PREFIX) if [ -x "$(LDCONFIG)" ] ; then \
$(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null ;\
else \
$(LN) -sf $< $@ ;\
fi
else # Darwin
ASTSSL_LIB:=libasteriskssl.dylib
@@ -304,11 +304,11 @@ $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): libasteriskpj.o libasteriskpj.exports
$(ASTPJ_LIB): $(ASTPJ_LIB).$(ASTPJ_SO_VERSION)
$(ECHO_PREFIX) echo " [LN] $< -> $@"
ifneq ($(LDCONFIG),)
$(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null
else
$(CMD_PREFIX) $(LN) -sf $< $@
endif
$(CMD_PREFIX) if [ -x "$(LDCONFIG)" ] ; then \
$(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null ;\
else \
$(LN) -sf $< $@ ;\
fi
else # Darwin
ASTPJ_LIB:=libasteriskpj.dylib