--- mono-debugger-2.0/build/Makefile.am 2008-07-31 20:08:36.000000000 +0100
+++ mono-debugger-2.0/build/Makefile-new.am 2008-08-05 20:42:51.000000000 +0100
@@ -1,4 +1,4 @@
-twodir = $(prefix)/lib/mono/2.0
+twodir = $(libdir)/mono/2.0
bin_SCRIPTS = mdb
@@ -76,17 +76,17 @@
SYMBOL_WRITER_DEPS = \
-r:Mono.GetOptions \
- -r:./Mono.Cecil.dll
+ -r:$(srcdir)/Mono.Cecil.dll
SYMBOL_READER_DEPS = \
-r:Mono.GetOptions \
- -r:./Mono.Cecil.dll
+ -r:$(srcdir)/Mono.Cecil.dll
DEBUGGER_DEPS = \
-r:Mono.GetOptions \
-r:Mono.Debugger.SymbolWriter \
-r:System.Runtime.Serialization.Formatters.Soap \
- -r:./Mono.Cecil.dll
+ -r:$(srcdir)/Mono.Cecil.dll
MDB_DEPS = \
-r:Mono.GetOptions \
@@ -94,16 +94,13 @@
TEST_DEPS = \
-r:Mono.GetOptions \
- -r:./Mono.Debugger.dll \
- -r:./Mono.Debugger.Frontend.dll \
- -r:nunit.framework \
-r:nunit.core
if MARTIN_PRIVATE
MCS_FLAGS += -define:MARTIN_PRIVATE
endif
-Mono.Debugger.SymbolWriter.dll: Makefile Mono.Cecil.dll $(SYMBOL_WRITER_SRCLIST)
+Mono.Debugger.SymbolWriter.dll: Makefile $(srcdir)/Mono.Cecil.dll $(SYMBOL_WRITER_SRCLIST)
$(MCS) -target:library -out:Mono.Debugger.SymbolWriter.dll -d:CECIL $(MCS_FLAGS) -keyfile:$(top_srcdir)/build/mono.snk $(SYMBOL_WRITER_DEPS) $(SYMBOL_WRITER_SRCLIST)
Mono.Debugger.dll: Makefile Mono.Debugger.SymbolWriter.dll $(DEBUGGER_SRCLIST)
@@ -151,7 +148,7 @@
< $(srcdir)/mdb.in > mdb.tmp \
&& mv mdb.tmp mdb
-NUNIT_CONSOLE_EXE = $(NUNIT_PREFIX)/lib/mono/2.0/nunit-console.exe
+NUNIT_CONSOLE_EXE = $(libdir)/mono/2.0/nunit-console.exe
runtests: runtests.in Makefile
builddir=$(top_builddir) ; the_builddir=`cd $$builddir && pwd` ; \
--- mono-debugger-2.0/build/Makefile.in 2008-07-31 20:08:54.000000000 +0100
+++ mono-debugger-2.0/build/Makefile-new.in 2008-08-05 20:46:13.000000000 +0100
@@ -270,17 +270,17 @@
SYMBOL_WRITER_DEPS = \
-r:Mono.GetOptions \
- -r:./Mono.Cecil.dll
+ -r:$(srcdir)/Mono.Cecil.dll
SYMBOL_READER_DEPS = \
-r:Mono.GetOptions \
- -r:./Mono.Cecil.dll
+ -r:$(srcdir)/Mono.Cecil.dll
DEBUGGER_DEPS = \
-r:Mono.GetOptions \
-r:Mono.Debugger.SymbolWriter \
-r:System.Runtime.Serialization.Formatters.Soap \
- -r:./Mono.Cecil.dll
+ -r:$(srcdir)/Mono.Cecil.dll
MDB_DEPS = \
-r:Mono.GetOptions \