[svn-commits] qwell: trunk r40832 - in /trunk: ./ agi/ build_tools/ main/db1-ast/ main/edit...

[svn-commits at lists.digium.com]

Author: qwell
Date: Tue Aug 22 00:24:50 2006
New Revision: 40832

URL: http://svn.digium.com/view/asterisk?rev=40832&view=rev
Log:
a couple Solaris tweaks, to help build properly.

Modified:
    trunk/Makefile
    trunk/agi/Makefile
    trunk/build_tools/make_version
    trunk/main/db1-ast/Makefile
    trunk/main/editline/Makefile.in

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=40832&r1=40831&r2=40832&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Aug 22 00:24:50 2006
@@ -177,7 +177,7 @@
 endif
 
 ifeq ($(OSARCH),SunOS)
-  ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
+  ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
 endif
 
 ASTERISKVERSION:=$(shell build_tools/make_version .)

Modified: trunk/agi/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/agi/Makefile?rev=40832&r1=40831&r2=40832&view=diff
==============================================================================
--- trunk/agi/Makefile (original)
+++ trunk/agi/Makefile Tue Aug 22 00:24:50 2006
@@ -16,7 +16,7 @@
 AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
 
 ifeq ($(OSARCH),SunOS)
-  LIBS+=-lsocket -lnsl ../strcompat.o
+  LIBS+=-lsocket -lnsl ../main/strcompat.o
 endif
 
 include $(ASTTOPDIR)/Makefile.rules

Modified: trunk/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_version?rev=40832&r1=40831&r2=40832&view=diff
==============================================================================
--- trunk/build_tools/make_version (original)
+++ trunk/build_tools/make_version Tue Aug 22 00:24:50 2006
@@ -5,7 +5,7 @@
 elif [ -f ${1}/.svnrevision ]; then
 	echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision`
 elif [ -d .svn ]; then
-    PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :g'`
+    PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
     BRANCH=0
     TEAM=0
     

Modified: trunk/main/db1-ast/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/main/db1-ast/Makefile?rev=40832&r1=40831&r2=40832&view=diff
==============================================================================
--- trunk/main/db1-ast/Makefile (original)
+++ trunk/main/db1-ast/Makefile Tue Aug 22 00:24:50 2006
@@ -54,7 +54,7 @@
 
 OSTYPE=$(shell uname -s)
 ifeq ($(OSTYPE),SunOS)
-CFLAGS+=-I../include -I../include/solaris-compat -DSOLARIS
+CFLAGS+=-I../../include -I../../include/solaris-compat -DSOLARIS
 endif
 
 db_dump185.o: db_dump185.c

Modified: trunk/main/editline/Makefile.in
URL: http://svn.digium.com/view/asterisk/trunk/main/editline/Makefile.in?rev=40832&r1=40831&r2=40832&view=diff
==============================================================================
--- trunk/main/editline/Makefile.in (original)
+++ trunk/main/editline/Makefile.in Tue Aug 22 00:24:50 2006
@@ -27,7 +27,7 @@
 PREFIX = @prefix@
 
 ifeq ($(OSTYPE),SunOS)
-CFLAGS+=-DSOLARIS -I../include/solaris-compat
+CFLAGS+=-DSOLARIS -I../../include/solaris-compat
 endif
 
 # .c files.