Merged in changes from vanilla fixes branch.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2743 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
6af7607485
commit
6ef929c392
|
@ -378,6 +378,7 @@ else if $(OS) = BEOS && $(OSPLAT) = PPC
|
||||||
CHGRP ?= chgrp ;
|
CHGRP ?= chgrp ;
|
||||||
CHOWN ?= chown ;
|
CHOWN ?= chown ;
|
||||||
FORTRAN ?= "" ;
|
FORTRAN ?= "" ;
|
||||||
|
LEX ?= flex ;
|
||||||
LIBDIR ?= /boot/home/config/lib ;
|
LIBDIR ?= /boot/home/config/lib ;
|
||||||
LINK ?= mwld ;
|
LINK ?= mwld ;
|
||||||
LINKFLAGS ?= "" ;
|
LINKFLAGS ?= "" ;
|
||||||
|
@ -398,6 +399,7 @@ else if $(OS) = BEOS
|
||||||
CHGRP ?= chgrp ;
|
CHGRP ?= chgrp ;
|
||||||
CHOWN ?= chown ;
|
CHOWN ?= chown ;
|
||||||
FORTRAN ?= "" ;
|
FORTRAN ?= "" ;
|
||||||
|
LEX ?= flex ;
|
||||||
LIBDIR ?= /boot/home/config/lib ;
|
LIBDIR ?= /boot/home/config/lib ;
|
||||||
LINK ?= gcc ;
|
LINK ?= gcc ;
|
||||||
MANDIR ?= /boot/home/config/man ;
|
MANDIR ?= /boot/home/config/man ;
|
||||||
|
|
|
@ -197,6 +197,7 @@ char *jambase[] = {
|
||||||
"CHGRP ?= chgrp ;\n",
|
"CHGRP ?= chgrp ;\n",
|
||||||
"CHOWN ?= chown ;\n",
|
"CHOWN ?= chown ;\n",
|
||||||
"FORTRAN ?= \"\" ;\n",
|
"FORTRAN ?= \"\" ;\n",
|
||||||
|
"LEX ?= flex ;\n",
|
||||||
"LIBDIR ?= /boot/home/config/lib ;\n",
|
"LIBDIR ?= /boot/home/config/lib ;\n",
|
||||||
"LINK ?= mwld ;\n",
|
"LINK ?= mwld ;\n",
|
||||||
"LINKFLAGS ?= \"\" ;\n",
|
"LINKFLAGS ?= \"\" ;\n",
|
||||||
|
@ -217,6 +218,7 @@ char *jambase[] = {
|
||||||
"CHGRP ?= chgrp ;\n",
|
"CHGRP ?= chgrp ;\n",
|
||||||
"CHOWN ?= chown ;\n",
|
"CHOWN ?= chown ;\n",
|
||||||
"FORTRAN ?= \"\" ;\n",
|
"FORTRAN ?= \"\" ;\n",
|
||||||
|
"LEX ?= flex ;\n",
|
||||||
"LIBDIR ?= /boot/home/config/lib ;\n",
|
"LIBDIR ?= /boot/home/config/lib ;\n",
|
||||||
"LINK ?= gcc ;\n",
|
"LINK ?= gcc ;\n",
|
||||||
"MANDIR ?= /boot/home/config/man ;\n",
|
"MANDIR ?= /boot/home/config/man ;\n",
|
||||||
|
|
Loading…
Reference in New Issue