From c096f1e6f4a3da3ed174b95aa4d161845fcef9d9 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Fri, 4 Nov 2005 23:24:15 +0000
Subject: [PATCH] Fixed bison build.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14712 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/bin/bison/lib/Jamfile     |  3 ++-
 src/bin/bison/src/Jamfile     | 10 +++++++---
 src/bin/bison/src/scan-gram.l |  2 +-
 src/bin/bison/src/scan-skel.l |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/bin/bison/lib/Jamfile b/src/bin/bison/lib/Jamfile
index fe67717892..914389f6de 100644
--- a/src/bin/bison/lib/Jamfile
+++ b/src/bin/bison/lib/Jamfile
@@ -2,7 +2,8 @@ SubDir HAIKU_TOP src bin bison lib ;
 
 SubDirCcFlags -DHAVE_CONFIG_H ;
 
-SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
+SubDirSysHdrs $(SUBDIR) ;
+SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
 
 StaticLibrary libbison.a : 
 	abitset.c
diff --git a/src/bin/bison/src/Jamfile b/src/bin/bison/src/Jamfile
index 8ca01a5d7a..70c8b68901 100644
--- a/src/bin/bison/src/Jamfile
+++ b/src/bin/bison/src/Jamfile
@@ -2,8 +2,8 @@ SubDir HAIKU_TOP src bin bison src ;
 
 SubDirCcFlags -DHAVE_CONFIG_H   -DPKGDATADIR=\'\"/etc\"\' -DLOCALEDIR=\'\"/etc/locale\"\' ;
 
-SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
-SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
+SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;
+SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
 
 BinCommand bison :
 	LR0.c
@@ -37,5 +37,9 @@ BinCommand bison :
 	uniqstr.c
 	vcg.c
 	: libbison.a
-	: bison.rdef ;
+	: bison.rdef
+;
 
+# Don't search scan-gram.c and scan-skel.c in the source directory.
+# We want to use the one generated from scan-gram.l and scan-skel.l.
+SEARCH on [ FGristFiles scan-gram.c scan-skel.c ] = ;
diff --git a/src/bin/bison/src/scan-gram.l b/src/bin/bison/src/scan-gram.l
index 7060ddbd62..268df5efbd 100644
--- a/src/bin/bison/src/scan-gram.l
+++ b/src/bin/bison/src/scan-gram.l
@@ -21,7 +21,7 @@
 */
 
 %option debug nodefault nounput noyywrap never-interactive
-%option prefix="gram_" outfile="lex.yy.c"
+%option prefix="gram_"
 
 %{
 #include "system.h"
diff --git a/src/bin/bison/src/scan-skel.l b/src/bin/bison/src/scan-skel.l
index a5b5f3f192..7474c7f1b1 100644
--- a/src/bin/bison/src/scan-skel.l
+++ b/src/bin/bison/src/scan-skel.l
@@ -20,7 +20,7 @@
    02110-1301, USA.  */
 
 %option nodefault noyywrap nounput never-interactive debug
-%option prefix="skel_" outfile="lex.yy.c"
+%option prefix="skel_"
 
 %{
 #include "system.h"