Browse code

- fixed a few openbsd warnings - changed intall doc & man path for non-linux systems (which are non LSB compliant)

Andrei Pelinescu-Onciul authored on 11/11/2002 22:36:41
Showing 4 changed files
... ...
@@ -3,9 +3,9 @@ $Id$
3 3
 
4 4
 Installation Notes
5 5
 
6
-Supported arhitectures: Linux/i386, Linux/armv4l, FreeBSD/i386,
6
+Supported arhitectures: Linux/i386, Linux/armv4l, FreeBSD/i386, OpenBSD/i386
7 7
 Solaris/sparc64 
8
-(for other arhitectures the Makefile must be edited)
8
+(for other arhitectures the Makefiles might need to be edited)
9 9
 
10 10
 There are various configuration options defined in the Makefile.
11 11
 
... ...
@@ -23,17 +23,17 @@ Requirements:
23 23
 - GNU install or BSD install (on Solaris "ginstall") if you want "make
24 24
   install", "make bin", "make sunpkg" to work
25 25
 - libmysqlclient & libz (zlib) if you want mysql support (the mysql module)
26
-- libxpat if you want the jabber gateway support (the jabber module)
26
+- libexpat if you want the jabber gateway support (the jabber module)
27 27
 
28 28
 
29 29
 OS Notes:
30 30
 
31
-- FreeBSD: make sure gmake, bison & flex are installed
31
+- FreeBSD/OpenBSD: make sure gmake, bison or yacc & flex are installed
32 32
 - Solaris: as above; you can use Solaris's yacc instead of bison. You might
33 33
   need also gtar and ginstall.
34
-- Windows: it works in windows (only the core) but you must install a recent
35
-  cygwin version (http://www.cygwin.com/) and also install a newer regex
36
-  library version (>=0.12). 
34
+- Windows: it works in windows (only the core, w/o shared mem. support) but you
35
+  must install a recent cygwin version (http://www.cygwin.com/) and also 
36
+  install a newer regex library version (>=0.12). 
37 37
     
38 38
 
39 39
 
... ...
@@ -3,7 +3,8 @@
3 3
 # sip_router makefile
4 4
 #
5 5
 # WARNING: requires gmake (GNU Make)
6
-#  Arch supported: Linux, FreeBSD, SunOS (tested on Solaris 8), WinNT (cygwin)
6
+#  Arch supported: Linux, FreeBSD, SunOS (tested on Solaris 8), OpenBSD (3.2),
7
+#  limited WinNT (cygwin) support
7 8
 
8 9
 auto_gen=lex.yy.c cfg.tab.c   #lexx, yacc etc
9 10
 
... ...
@@ -36,8 +36,13 @@ ut-prefix = $(basedir)$(prefix)
36 36
 cfg-dir = etc/ser/
37 37
 bin-dir = sbin/
38 38
 modules-dir = lib/ser/modules/
39
-doc-dir = share/doc/ser/
40
-man-dir = share/man/
39
+ifeq ($(OS), linux)
40
+	doc-dir = share/doc/ser/
41
+	man-dir = share/man/
42
+else
43
+	doc-dir=doc/ser/
44
+	man-dir=man/
45
+endif
41 46
 ut-prefix = bin/
42 47
 # target dirs for various stuff
43 48
 cfg-target = $(prefix)/$(cfg-dir)
... ...
@@ -473,7 +478,7 @@ endif
473 478
 
474 479
 
475 480
 #os specific stuff
476
-ifeq ($(OS), Linux)
481
+ifeq ($(OS), linux)
477 482
 	#same as common
478 483
 endif
479 484
 
... ...
@@ -82,7 +82,7 @@
82 82
 
83 83
 static char id[]="@(#) $Id$";
84 84
 static char version[]=  NAME " " VERSION " (" ARCH "/" OS ")" ;
85
-static char compiled[]= __TIME__ __DATE__ ;
85
+static char compiled[]= __TIME__ " " __DATE__ ;
86 86
 static char flags[]=
87 87
 "STATS:"
88 88
 #ifdef STATS
... ...
@@ -758,7 +758,9 @@ int add_interfaces(char* if_name, int family, unsigned short port)
758 758
 	int ret;
759 759
 
760 760
 #ifdef HAVE_SOCKADDR_SA_LEN
761
-	#define MAX(a,b) ( ((a)>(b))?(a):(b))
761
+	#ifndef MAX
762
+		#define MAX(a,b) ( ((a)>(b))?(a):(b))
763
+	#endif
762 764
 #endif
763 765
 	/* ipv4 or ipv6 only*/
764 766
 	s=socket(family, SOCK_DGRAM, 0);