From 15d161b97e69765e54bef9a2f30d75afba428f7a Mon Sep 17 00:00:00 2001
From: Stephan Aßmus <superstippi@gmx.de>
Date: Mon, 31 Aug 2009 20:39:54 +0000
Subject: [PATCH] Patch by scottmc: * On Haiku, the jam install folder should be /boot/common.


git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@32875 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 jam/Jambase   | 23 +++++++++++++++++++++++
 jam/jambase.c | 23 +++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/jam/Jambase b/jam/Jambase
index 187f2d3..148e36f 100644
--- a/jam/Jambase
+++ b/jam/Jambase
@@ -396,7 +396,7 @@
 	YACCFILES	?= y.tab ;
 	YACCFLAGS	?= -d ;
 }
-else if $(OS) = BEOS || $(OS) = HAIKU
+else if $(OS) = BEOS
 {
 	BINDIR		?= /boot/home/config/bin ;
 	CC		?= gcc ;
@@ -409,6 +409,27 @@
 	LIBDIR		?= /boot/home/config/lib ;
 	LINK		?= gcc ;
 	MANDIR		?= /boot/home/config/man ;
+	NOARSCAN	?= true ;
+	RANLIB		?= ranlib ;
+	STDHDRS		?= /boot/develop/headers/posix ;
+	YACC		?= bison -y ;
+	YACCGEN		?= .c ;
+	YACCFILES	?= y.tab ;
+	YACCFLAGS	?= -d ;
+}
+else if $(OS) = HAIKU
+{
+	BINDIR		?= /boot/common/bin ;
+	CC		?= gcc ;
+	C++		?= $(CC) ;
+	CHMOD		?= chmod ;
+	CHGRP		?= chgrp ;
+	CHOWN		?= chown ;
+	FORTRAN		?= "" ;
+	LEX		?= flex ;
+	LIBDIR		?= /boot/common/lib ;
+	LINK		?= gcc ;
+	MANDIR		?= /boot/common/man ;
 	NOARSCAN	?= true ;
 	RANLIB		?= ranlib ;
 	STDHDRS		?= /boot/develop/headers/posix ;
diff --git a/jam/jambase.c b/jam/jambase.c
index 7cef65e..fcff064 100644
--- a/jam/jambase.c
+++ b/jam/jambase.c
@@ -211,7 +211,7 @@
 "YACCFILES	?= y.tab ;\n",
 "YACCFLAGS	?= -d ;\n",
 "}\n",
-"else if $(OS) = BEOS || $(OS) = HAIKU\n",
+"else if $(OS) = BEOS\n",
 "{\n",
 "BINDIR		?= /boot/home/config/bin ;\n",
 "CC		?= gcc ;\n",
@@ -224,6 +224,27 @@
 "LIBDIR		?= /boot/home/config/lib ;\n",
 "LINK		?= gcc ;\n",
 "MANDIR		?= /boot/home/config/man ;\n",
+"NOARSCAN	?= true ;\n",
+"RANLIB		?= ranlib ;\n",
+"STDHDRS		?= /boot/develop/headers/posix ;\n",
+"YACC		?= bison -y ;\n",
+"YACCGEN		?= .c ;\n",
+"YACCFILES	?= y.tab ;\n",
+"YACCFLAGS	?= -d ;\n",
+"}\n",
+"else if $(OS) = HAIKU\n",
+"{\n",
+"BINDIR		?= /boot/common/bin ;\n",
+"CC		?= gcc ;\n",
+"C++		?= $(CC) ;\n",
+"CHMOD		?= chmod ;\n",
+"CHGRP		?= chgrp ;\n",
+"CHOWN		?= chown ;\n",
+"FORTRAN		?= \"\" ;\n",
+"LEX		?= flex ;\n",
+"LIBDIR		?= /boot/common/lib ;\n",
+"LINK		?= gcc ;\n",
+"MANDIR		?= /boot/common/man ;\n",
 "NOARSCAN	?= true ;\n",
 "RANLIB		?= ranlib ;\n",
 "STDHDRS		?= /boot/develop/headers/posix ;\n",
--
gitore 0.2.2