prepend $(CURDIR) to jay input files so that the debugging info references the right...

diff --git a/mcs/class/Commons.Xml.Relaxng/Makefile b/mcs/class/Commons.Xml.Relaxng/Makefile
index c43c5f745a9471df194f53316cbdf519718b9a1e..5e9c85d4b35a6c889ea609c907b6dae81d67ecb4 100644 (file)
--- a/mcs/class/Commons.Xml.Relaxng/Makefile
+++ b/mcs/class/Commons.Xml.Relaxng/Makefile
@@ -22,7 +22,7 @@ EXTRA_DISTFILES = \
        $(RESOURCE_FILES)
 
 Commons.Xml.Relaxng.Rnc/RncParser.cs: Commons.Xml.Relaxng.Rnc/RncParser.jay $(topdir)/jay/skeleton.cs
-       $(topdir)/jay/jay -ctv < $(topdir)/jay/skeleton.cs Commons.Xml.Relaxng.Rnc/RncParser.jay > Commons.Xml.Relaxng.Rnc/RncParser.cs
+       $(topdir)/jay/jay -ctv < $(topdir)/jay/skeleton.cs $(CURDIR)/Commons.Xml.Relaxng.Rnc/RncParser.jay > Commons.Xml.Relaxng.Rnc/RncParser.cs
 
 BUILT_SOURCES = Commons.Xml.Relaxng.Rnc/RncParser.cs
 

diff --git a/mcs/class/Mono.Xml.Ext/Makefile b/mcs/class/Mono.Xml.Ext/Makefile
index 20b70c83ecd850c8df402d754cad0c3e193eac22..6bf2ff64352ac9a05ee3c8495a0239c41065f774 100644 (file)
--- a/mcs/class/Mono.Xml.Ext/Makefile
+++ b/mcs/class/Mono.Xml.Ext/Makefile
@@ -28,13 +28,13 @@ Mono.Xml.XPath2/XQueryParser.jay: Mono.Xml.XPath2/ParserBase.jay $(SKELETON)
 Mono.Xml.XPath2/XPath2Parser.cs: Mono.Xml.XPath2/XPath2Parser.jay
        echo "#define XPATH2_PARSER" > $@
        echo "#if NET_2_0" >> $@
-       $(topdir)/jay/jay -ct < $(SKELETON) $< >>$@
+       $(topdir)/jay/jay -ct < $(SKELETON) $(CURDIR)/$< >>$@
        echo "#endif" >> $@
 
 Mono.Xml.XPath2/XQueryParser.cs: Mono.Xml.XPath2/XQueryParser.jay $(SKELETON)
        echo "#define XQUERY_PARSER" > $@
        echo "#if NET_2_0" >> $@
-       $(topdir)/jay/jay -ct < $(SKELETON) $< >>$@
+       $(topdir)/jay/jay -ct < $(SKELETON) $(CURDIR)/$< >>$@
        echo "#endif" >> $@
 
 Mono.Xml.XPath2/XPath2Tokenizer.cs: Mono.Xml.XPath2/TokenizerBase.cs

diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile
index 0a307fa198890a2970915d57901a9d72b01ca129..8990125c76923e5edc0570631c79d00e980b93bc 100644 (file)
--- a/mcs/class/System.Data/Makefile
+++ b/mcs/class/System.Data/Makefile
@@ -63,7 +63,7 @@ EXTRA_DISTFILES = \
 BUILT_SOURCES = Mono.Data.SqlExpressions/Parser.cs
 
 Mono.Data.SqlExpressions/Parser.cs: Mono.Data.SqlExpressions/Parser.jay $(topdir)/jay/skeleton.cs
-       $(topdir)/jay/jay -ct < $(topdir)/jay/skeleton.cs $< >$@
+       $(topdir)/jay/jay -ct < $(topdir)/jay/skeleton.cs $(CURDIR)/$< >$@
 
 include ../../build/library.make
 

diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile
index 418e94f57f4ae0b8a80d500d47e3979c48196a6f..e30541c3d824ba11698c9c47b512d750e0807906 100644 (file)
--- a/mcs/class/System.XML/Makefile
+++ b/mcs/class/System.XML/Makefile
@@ -77,14 +77,14 @@ EXTRA_DISTFILES = \
        $(nist_dom_files:%=Test/System.Xml/nist_dom/%)
 
 System.Xml.XPath/Parser.cs: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
-       $(topdir)/jay/jay -ct < $(topdir)/jay/skeleton.cs $< >$@
+       $(topdir)/jay/jay -ct < $(topdir)/jay/skeleton.cs $(CURDIR)/$< >$@
 
 Mono.Xml.Xsl/PatternParser.jay: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
        sed "s/\%start Expr/\%start Pattern/" $< >$@
 
 Mono.Xml.Xsl/PatternParser.cs: Mono.Xml.Xsl/PatternParser.jay $(topdir)/jay/skeleton.cs
        echo "#define XSLT_PATTERN" > $@
-       $(topdir)/jay/jay -ct $< < $(topdir)/jay/skeleton.cs >>$@
+       $(topdir)/jay/jay -ct $(CURDIR)/$< < $(topdir)/jay/skeleton.cs >>$@
 
 Mono.Xml.Xsl/PatternTokenizer.cs: System.Xml.XPath/Tokenizer.cs
        echo "#define XSLT_PATTERN" > $@

diff --git a/mcs/ilasm/Makefile b/mcs/ilasm/Makefile
index 2cc031dd59afb86c67fbdfb59143d689e44976d8..ed1506c9a6f4acd02458367b32e12244a06abedb 100644 (file)
--- a/mcs/ilasm/Makefile
+++ b/mcs/ilasm/Makefile
@@ -16,7 +16,7 @@ EXTRA_DISTFILES = \
        $(wildcard tests/*.il)
 
 ILParser.cs: parser/ILParser.jay $(topdir)/jay/skeleton.cs
-       $(topdir)/jay/jay -ct < $(topdir)/jay/skeleton.cs $< >$@
+       $(topdir)/jay/jay -ct < $(topdir)/jay/skeleton.cs $(CURDIR)/$< >$@
 
 include ../build/executable.make