From 8485888933d0bdfcf9a56336795ee686eeccc470 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 15 Jun 2004 20:20:15 +0000
Subject: [PATCH] This should be a bit nicer: Just maintain the grist of the
 supplied target instead of using the one from the current subdir. Should make
 no difference in practice but is more correct this way.

BTW, fixes should rather go into a fixes branch to keep them separate
from new/changed features that won't be included into Perforce jam.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7996 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/tools/jam/Jambase   | 2 +-
 src/tools/jam/jambase.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tools/jam/Jambase b/src/tools/jam/Jambase
index 9e0726b377..1ed3bf4e90 100644
--- a/src/tools/jam/Jambase
+++ b/src/tools/jam/Jambase
@@ -1498,7 +1498,7 @@ rule Yacc
 {
 	local _h ;
 
-	_h = [ FGristFiles $(<:BS=.h) ] ;
+	_h = $(<:S=.h) ;
 
 	# Some places don't have a yacc.
 
diff --git a/src/tools/jam/jambase.c b/src/tools/jam/jambase.c
index 6c5001e6d9..a2921e77f2 100644
--- a/src/tools/jam/jambase.c
+++ b/src/tools/jam/jambase.c
@@ -848,7 +848,7 @@ const char *jambase[] = {
 "rule Yacc\n",
 "{\n",
 "local _h ;\n",
-"_h = $(<:BS=.h) ;\n",
+"_h = $(<:S=.h) ;\n",
 "MakeLocate $(<) $(_h) : $(LOCATE_SOURCE) ;\n",
 "if $(YACC)\n",
 "{\n",