From a610fc74593afbac96d015fc9c13541d5b5d5e9b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 17 Jul 2002 17:18:28 +0000 Subject: [PATCH] Merged vanilla branch into main trunk. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@280 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tools/jam/Jambase | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/tools/jam/Jambase b/src/tools/jam/Jambase index a12e61b69e..4a8b94e0ef 100644 --- a/src/tools/jam/Jambase +++ b/src/tools/jam/Jambase @@ -369,30 +369,38 @@ else if $(MAC) else if $(OS) = BEOS && $(METROWERKS) { AR ?= mwld -xml -o ; - BINDIR ?= /boot/apps ; + BINDIR ?= /boot/home/config/bin ; CC ?= mwcc ; CCFLAGS ?= -nosyspath ; C++ ?= $(CC) ; C++FLAGS ?= -nosyspath ; + CHMOD ?= chmod ; + CHGRP ?= chgrp ; + CHOWN ?= chown ; FORTRAN ?= "" ; - LIBDIR ?= /boot/develop/libraries ; + LIBDIR ?= /boot/home/config/lib ; LINK ?= mwld ; LINKFLAGS ?= "" ; - MANDIR ?= /boot/documentation/"Shell Tools"/HTML ; + MANDIR ?= /boot/home/config/man ; NOARSCAN ?= true ; STDHDRS ?= /boot/develop/headers/posix ; + YACC ?= bison -y ; + YACCGEN ?= .c ; + YACCFILES ?= y.tab ; + YACCFLAGS ?= -d ; } else if $(OS) = BEOS { - BINDIR ?= /boot/apps ; + BINDIR ?= /boot/home/config/bin ; CC ?= gcc ; C++ ?= $(CC) ; CHMOD ?= chmod ; CHGRP ?= chgrp ; CHOWN ?= chown ; FORTRAN ?= "" ; - LIBDIR ?= /boot/develop/libraries ; + LIBDIR ?= /boot/home/config/lib ; LINK ?= gcc ; + MANDIR ?= /boot/home/config/man ; NOARSCAN ?= true ; RANLIB ?= ranlib ; STDHDRS ?= /boot/develop/headers/posix ;