Ticket #4391: jam-haiku-common.diff

Jambase

@@ -396 +396 @@
     YACCFILES   ?= y.tab ;
     YACCFLAGS   ?= -d ;
 }
-else if $(OS) = BEOS || $(OS) = HAIKU
+else if $(OS) = BEOS
 {
     BINDIR      ?= /boot/home/config/bin ;
     CC      ?= gcc ;
@@ -417 +417 @@
     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 ;
+    YACC        ?= bison -y ;
+    YACCGEN     ?= .c ;
+    YACCFILES   ?= y.tab ;
+    YACCFLAGS   ?= -d ;
+}
 else if $(UNIX)
 {
     switch $(OS)

jambase.c

@@ -211 +211 @@
 "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",
@@ -232 +232 @@
 "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",
+"YACC       ?= bison -y ;\n",
+"YACCGEN        ?= .c ;\n",
+"YACCFILES  ?= y.tab ;\n",
+"YACCFLAGS  ?= -d ;\n",
+"}\n",
 "else if $(UNIX)\n",
 "{\n",
 "switch $(OS)\n",