kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 03:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 36290 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/trunk@36317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2006-06-29 22:01:41 +00:00
parent f5c0cd2ddc
commit 459b7e25bc
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@@ -66,16 +66,16 @@ DESTDIR?=
# Define standard directories for various platforms # Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf # These apply if they are not redefined in asterisk.conf
ifeq ($(OSARCH),SunOS) ifeq ($(OSARCH),SunOS)
ASTETCDIR=/etc/opt/asterisk ASTETCDIR=/var/etc/asterisk
ASTLIBDIR=/opt/asterisk/lib ASTLIBDIR=/opt/asterisk/lib
ASTVARLIBDIR=/var/opt/asterisk/lib ASTVARLIBDIR=/var/opt/asterisk
ASTSPOOLDIR=/var/opt/asterisk/spool ASTSPOOLDIR=/var/spool/asterisk
ASTLOGDIR=/var/opt/asterisk/log ASTLOGDIR=/var/log/asterisk
ASTHEADERDIR=/opt/asterisk/usr/include/asterisk ASTHEADERDIR=/opt/asterisk/include
ASTBINDIR=/opt/asterisk/usr/bin ASTBINDIR=/opt/asterisk/bin
ASTSBINDIR=/opt/asterisk/usr/sbin ASTSBINDIR=/opt/asterisk/sbin
ASTVARRUNDIR=/var/opt/asterisk/run ASTVARRUNDIR=/var/run/asterisk
ASTMANDIR=/opt/asterisk/usr/share/man ASTMANDIR=/opt/asterisk/man
else else
ASTETCDIR=$(sysconfdir)/asterisk ASTETCDIR=$(sysconfdir)/asterisk
ASTLIBDIR=$(libdir)/asterisk ASTLIBDIR=$(libdir)/asterisk
@@ -250,7 +250,7 @@ ifeq ($(OSARCH),OpenBSD)
endif endif
ifeq ($(OSARCH),SunOS) 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 endif
LIBEDIT=editline/libedit.a LIBEDIT=editline/libedit.a
@@ -349,7 +349,7 @@ ifeq ($(OSARCH),OpenBSD)
endif endif
ifeq ($(OSARCH),SunOS) 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 OBJS+=strcompat.o
MENUSELECT_OBJS+=strcompat.o MENUSELECT_OBJS+=strcompat.o
ASTLINK= ASTLINK=