diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-03-31 12:35:49 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-03-31 12:35:49 -0500 |
| commit | b602886c6bd6d48a96d66724ba207f794e8cbe02 (patch) | |
| tree | 1608a6d4d21e5cfe595074f8b6f0e837b933bde7 | |
| parent | cb9b7f6b1befa30dd3d59e7b9423dfbb8adb568e (diff) | |
| parent | 964f54bd5d9fff378a48cbaed9b7f819df6cdde6 (diff) | |
Merge "pjproject_bundled: Fix use of LDCONFIG for shared library link creation" into 13
| -rw-r--r-- | main/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/main/Makefile b/main/Makefile index 70b2a3900..a64eabcde 100644 --- a/main/Makefile +++ b/main/Makefile @@ -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 |