diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-29 22:01:41 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-29 22:01:41 +0000 |
| commit | d066798becc6ebdad18c68974d886b99ab5d93c3 (patch) | |
| tree | 81d4a27223ef508b56d3683b1d2e1fd60a330f7e /Makefile | |
| parent | 0423e3b72b70bf1c709df7a2a3816fb27f71bb67 (diff) | |
Merged revisions 36290 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r36290 | tilghman | 2006-06-29 14:23:18 -0500 (Thu, 29 Jun 2006) | 2 lines
Bug 7388 - compatibility changes for Solaris
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@36317 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -66,16 +66,16 @@ DESTDIR?= # Define standard directories for various platforms # These apply if they are not redefined in asterisk.conf ifeq ($(OSARCH),SunOS) - ASTETCDIR=/etc/opt/asterisk + ASTETCDIR=/var/etc/asterisk ASTLIBDIR=/opt/asterisk/lib - ASTVARLIBDIR=/var/opt/asterisk/lib - ASTSPOOLDIR=/var/opt/asterisk/spool - ASTLOGDIR=/var/opt/asterisk/log - ASTHEADERDIR=/opt/asterisk/usr/include/asterisk - ASTBINDIR=/opt/asterisk/usr/bin - ASTSBINDIR=/opt/asterisk/usr/sbin - ASTVARRUNDIR=/var/opt/asterisk/run - ASTMANDIR=/opt/asterisk/usr/share/man + ASTVARLIBDIR=/var/opt/asterisk + ASTSPOOLDIR=/var/spool/asterisk + ASTLOGDIR=/var/log/asterisk + ASTHEADERDIR=/opt/asterisk/include + ASTBINDIR=/opt/asterisk/bin + ASTSBINDIR=/opt/asterisk/sbin + ASTVARRUNDIR=/var/run/asterisk + ASTMANDIR=/opt/asterisk/man else ASTETCDIR=$(sysconfdir)/asterisk ASTLIBDIR=$(libdir)/asterisk @@ -250,7 +250,7 @@ ifeq ($(OSARCH),OpenBSD) endif ifeq ($(OSARCH),SunOS) - ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include + ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/opt/ssl/include -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include endif LIBEDIT=editline/libedit.a @@ -349,7 +349,7 @@ ifeq ($(OSARCH),OpenBSD) endif ifeq ($(OSARCH),SunOS) - LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib + LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/opt/ssl/lib -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib OBJS+=strcompat.o MENUSELECT_OBJS+=strcompat.o ASTLINK= |