[asterisk-commits] qwell: trunk r378074 - in /trunk: ./ main/Makefile

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Dec 17 14:59:54 CST 2012


Author: qwell
Date: Mon Dec 17 14:59:51 2012
New Revision: 378074

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=378074
Log:
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

Modified:
    trunk/   (props changed)
    trunk/main/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/main/Makefile?view=diff&rev=378074&r1=378073&r2=378074
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Mon Dec 17 14:59:51 2012
@@ -259,7 +259,7 @@
 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




More information about the asterisk-commits mailing list