From 0264c362b6ad3c7f23ea6eb5e398a30f7d4e26ef Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Tue, 22 Aug 2006 05:24:50 +0000
Subject: [PATCH] a couple Solaris tweaks, to help build properly.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
Makefile | 2 +-
agi/Makefile | 2 +-
build_tools/make_version | 2 +-
main/db1-ast/Makefile | 2 +-
main/editline/Makefile.in | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index b1a9d6e90a..7fd3c803fe 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,7 @@ ifeq ($(OSARCH),OpenBSD)
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 .)
diff --git a/agi/Makefile b/agi/Makefile
index e65357c5cf..a6c52c9182 100644
--- a/agi/Makefile
+++ b/agi/Makefile
@@ -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
diff --git a/build_tools/make_version b/build_tools/make_version
index b943f03b9d..ace5221599 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -5,7 +5,7 @@ if [ -f ${1}/.version ]; then
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
diff --git a/main/db1-ast/Makefile b/main/db1-ast/Makefile
index 5a9f29cde1..3e5a6fb2d8 100644
--- a/main/db1-ast/Makefile
+++ b/main/db1-ast/Makefile
@@ -54,7 +54,7 @@ CFLAGS+=-Wall -D__DBINTERFACE_PRIVATE -I. -I.. -Iinclude -Ihash -Ibtree -Irecno
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
diff --git a/main/editline/Makefile.in b/main/editline/Makefile.in
index 805642281a..1b46486176 100644
--- a/main/editline/Makefile.in
+++ b/main/editline/Makefile.in
@@ -27,7 +27,7 @@ INSTALL = @INSTALL@
PREFIX = @prefix@
ifeq ($(OSTYPE),SunOS)
-CFLAGS+=-DSOLARIS -I../include/solaris-compat
+CFLAGS+=-DSOLARIS -I../../include/solaris-compat
endif
# .c files.
--
GitLab