diff options
| author | Automerge script <automerge@asterisk.org> | 2012-12-17 21:18:01 +0000 |
|---|---|---|
| committer | Automerge script <automerge@asterisk.org> | 2012-12-17 21:18:01 +0000 |
| commit | be4cc7b20bba0a34e2e179a91456f22ea24b9eca (patch) | |
| tree | 96ff890d06fc83d4d3b8c54d63cbe2cd21d167a5 /main | |
| parent | d4aeeecffa1b93c32159184171c28751f546f28a (diff) | |
Merged revisions 378072,378074 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
................
r378072 | rmudgett | 2012-12-17 14:34:25 -0600 (Mon, 17 Dec 2012) | 9 lines
chan_local: Misc lock and ref tweaks.
* awesome_locking() does not need to thrash the pvt lock as much.
* local_setoption() does not need to check for NULL pvt on cleanup since
it will never be NULL.
* Made ref the pvt before locking for consistency.
................
r378074 | qwell | 2012-12-17 14:59:51 -0600 (Mon, 17 Dec 2012) | 10 lines
Make libasteriskssl.so symlink use a relative path.
This was causing issues when using DESTDIR, since the path to which the link
pointed is not likely to exist (and not useful to exist) on the target system.
(issue ASTNOW-284)
........
Merged revisions 378073 from http://svn.asterisk.org/svn/asterisk/branches/11
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile index 2adc500fd..d0a2d0559 100644 --- a/main/Makefile +++ b/main/Makefile @@ -259,7 +259,7 @@ bininstall: 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)" + $(LN) -sf $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB)" else # Darwin $(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(ASTLIBDIR)/" endif |