From 540cfa70e8e8b4db3cc2addccfcbeeb69fffa033 Mon Sep 17 00:00:00 2001
From: victor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Fri, 10 Sep 2004 00:49:47 +0000
Subject: merge back from branch victor.solaris

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2189 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 innbbsd/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'innbbsd/Makefile')

diff --git a/innbbsd/Makefile b/innbbsd/Makefile
index 9bb71f52..9399d32d 100644
--- a/innbbsd/Makefile
+++ b/innbbsd/Makefile
@@ -7,7 +7,8 @@
 # ------------------------------------------------------- #
 # stdarg.h patch for pttbbs by in2 03/05/05               #
 
-OSTYPE!=uname
+OS!=uname
+OSTYPE?=$(OS)
 ####################################################
 # this is a bbs <--> news gateway
 #####################################################
@@ -30,6 +31,7 @@ BBS_REC = $(BBS_UTIL)/util_record.o $(BBS_UTIL)/util_cache.o \
 	  $(BBS_UTIL)/util_var.o $(BBS_REC_EXTRA_$(OSTYPE))
 
 BBS_REC_EXTRA_Linux = $(BBS_UTIL)/util_osdep.o
+BBS_REC_EXTRA_Solaris = $(BBS_UTIL)/util_osdep.o
 
 #########################
 #
@@ -92,8 +94,10 @@ hpux:
 irix: 
 	@$(MAKE) EXTRAFLAGS="-DMMAP -DIRIX -DSYSV" target
 
+Solaris: solaris
+
 solaris:
-	@$(MAKE) EXTRAFLAGS="-DMMAP -DSOLARIS -DSYSV" LDFLAGS="-lsocket -lnsl" YACC="bison -y" target
+	@$(MAKE) EXTRAFLAGS="-DMMAP -DSOLARIS -DSYSV -I/usr/local/include/ -I../include/" LDFLAGS="-L/usr/local/lib -liconv -lsocket -lnsl -lkstat ../mbbsd/osdep.o" YACC="bison -y" target
 
 FreeBSD:
 	@$(MAKE) CC=cc EXTRAFLAGS="-DBSD44 -DMMAP -DGETRUSAGE" LDFLAGS="-lcrypt -liconv" target
-- 
cgit v1.2.3