Merged vanilla branch into main trunk.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@280 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+13
-5
@@ -369,30 +369,38 @@ else if $(MAC)
|
|||||||
else if $(OS) = BEOS && $(METROWERKS)
|
else if $(OS) = BEOS && $(METROWERKS)
|
||||||
{
|
{
|
||||||
AR ?= mwld -xml -o ;
|
AR ?= mwld -xml -o ;
|
||||||
BINDIR ?= /boot/apps ;
|
BINDIR ?= /boot/home/config/bin ;
|
||||||
CC ?= mwcc ;
|
CC ?= mwcc ;
|
||||||
CCFLAGS ?= -nosyspath ;
|
CCFLAGS ?= -nosyspath ;
|
||||||
C++ ?= $(CC) ;
|
C++ ?= $(CC) ;
|
||||||
C++FLAGS ?= -nosyspath ;
|
C++FLAGS ?= -nosyspath ;
|
||||||
|
CHMOD ?= chmod ;
|
||||||
|
CHGRP ?= chgrp ;
|
||||||
|
CHOWN ?= chown ;
|
||||||
FORTRAN ?= "" ;
|
FORTRAN ?= "" ;
|
||||||
LIBDIR ?= /boot/develop/libraries ;
|
LIBDIR ?= /boot/home/config/lib ;
|
||||||
LINK ?= mwld ;
|
LINK ?= mwld ;
|
||||||
LINKFLAGS ?= "" ;
|
LINKFLAGS ?= "" ;
|
||||||
MANDIR ?= /boot/documentation/"Shell Tools"/HTML ;
|
MANDIR ?= /boot/home/config/man ;
|
||||||
NOARSCAN ?= true ;
|
NOARSCAN ?= true ;
|
||||||
STDHDRS ?= /boot/develop/headers/posix ;
|
STDHDRS ?= /boot/develop/headers/posix ;
|
||||||
|
YACC ?= bison -y ;
|
||||||
|
YACCGEN ?= .c ;
|
||||||
|
YACCFILES ?= y.tab ;
|
||||||
|
YACCFLAGS ?= -d ;
|
||||||
}
|
}
|
||||||
else if $(OS) = BEOS
|
else if $(OS) = BEOS
|
||||||
{
|
{
|
||||||
BINDIR ?= /boot/apps ;
|
BINDIR ?= /boot/home/config/bin ;
|
||||||
CC ?= gcc ;
|
CC ?= gcc ;
|
||||||
C++ ?= $(CC) ;
|
C++ ?= $(CC) ;
|
||||||
CHMOD ?= chmod ;
|
CHMOD ?= chmod ;
|
||||||
CHGRP ?= chgrp ;
|
CHGRP ?= chgrp ;
|
||||||
CHOWN ?= chown ;
|
CHOWN ?= chown ;
|
||||||
FORTRAN ?= "" ;
|
FORTRAN ?= "" ;
|
||||||
LIBDIR ?= /boot/develop/libraries ;
|
LIBDIR ?= /boot/home/config/lib ;
|
||||||
LINK ?= gcc ;
|
LINK ?= gcc ;
|
||||||
|
MANDIR ?= /boot/home/config/man ;
|
||||||
NOARSCAN ?= true ;
|
NOARSCAN ?= true ;
|
||||||
RANLIB ?= ranlib ;
|
RANLIB ?= ranlib ;
|
||||||
STDHDRS ?= /boot/develop/headers/posix ;
|
STDHDRS ?= /boot/develop/headers/posix ;
|
||||||
|
|||||||
Reference in New Issue
Block a user