Third pass

svn path=/trunk/mono/; revision=36588

12 files changed, 13 insertions, 13 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b301ff5df55..897230d3c1f 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,6 +1,6 @@
-EXTRA_DIST = mcs.in mbas.in ilasm.in cilc.in monoresgen.in resgen.in secutil.in sqlsharp.in xsd.in wsdl.in genxs.in soapsuds.in chktrust.in signcode.in disco.in sn.in al.in cert2spc.in setreg.in makecert.in certmgr.in monop.in gacutil.in gmcs.in mono-find-provides.in mono-find-requires.in
+EXTRA_DIST = mcs.in mbas.in ilasm.in cilc.in monoresgen.in resgen.in secutil.in sqlsharp.in xsd.in wsdl2.in wsdl.in genxs.in soapsuds.in chktrust.in signcode.in disco.in sn.in al.in cert2spc.in setreg.in makecert.in certmgr.in monop.in gacutil.in gmcs.in mono-find-provides.in mono-find-requires.in
 
-bin_SCRIPTS = mcs mbas ilasm cilc monoresgen resgen secutil sqlsharp xsd wsdl al genxs soapsuds chktrust signcode disco sn cert2spc setreg makecert certmgr monop gacutil gmcs mono-find-requires mono-find-provides
+bin_SCRIPTS = mcs mbas ilasm cilc monoresgen resgen secutil sqlsharp xsd wsdl wsdl2 al genxs soapsuds chktrust signcode disco sn cert2spc setreg makecert certmgr monop gacutil gmcs mono-find-requires mono-find-provides
 
 CLEANFILES = $(bin_SCRIPTS)
 
diff --git a/scripts/al.in b/scripts/al.in
index cc83c136454..93111b7b698 100644
--- a/scripts/al.in
+++ b/scripts/al.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @plat_bindir@/al.exe "$@"
+exec @bindir@/@mono_interp@ @mono_one_instdir@/al.exe "$@"
diff --git a/scripts/cilc.in b/scripts/cilc.in
index ba15bd4f22c..eb76952f4e4 100644
--- a/scripts/cilc.in
+++ b/scripts/cilc.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @plat_bindir@/cilc.exe "$@"
+exec @bindir@/@mono_interp@ @mono_one_instdir@/cilc.exe "$@"
diff --git a/scripts/genxs.in b/scripts/genxs.in
index c1ae8c95f77..ed5cc077b6a 100644
--- a/scripts/genxs.in
+++ b/scripts/genxs.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @plat_bindir@/genxs.exe "$@"
+exec @bindir@/@mono_interp@ @mono_one_instdir@/genxs.exe "$@"
diff --git a/scripts/ilasm.in b/scripts/ilasm.in
index f68edb31e3f..2ef075e7429 100644
--- a/scripts/ilasm.in
+++ b/scripts/ilasm.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @plat_bindir@/ilasm.exe "$@"
+exec @bindir@/@mono_interp@ @mono_one_instdir@/ilasm.exe "$@"
diff --git a/scripts/monoresgen.in b/scripts/monoresgen.in
index b50ebeeb6af..fd4bec7fd38 100644
--- a/scripts/monoresgen.in
+++ b/scripts/monoresgen.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @plat_bindir@/monoresgen.exe "$@"
+exec @bindir@/@mono_interp@ @mono_one_instdir@/monoresgen.exe "$@"
diff --git a/scripts/resgen.in b/scripts/resgen.in
index b50ebeeb6af..fd4bec7fd38 100644
--- a/scripts/resgen.in
+++ b/scripts/resgen.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @plat_bindir@/monoresgen.exe "$@"
+exec @bindir@/@mono_interp@ @mono_one_instdir@/monoresgen.exe "$@"
diff --git a/scripts/soapsuds.in b/scripts/soapsuds.in
index 8c7dfe5eb52..5dcb9341dc3 100644
--- a/scripts/soapsuds.in
+++ b/scripts/soapsuds.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @plat_bindir@/soapsuds.exe "$@"
+exec @bindir@/@mono_interp@ @mono_one_instdir@/soapsuds.exe "$@"
diff --git a/scripts/sqlsharp.in b/scripts/sqlsharp.in
index f93bf07e873..d31ae17d270 100644
--- a/scripts/sqlsharp.in
+++ b/scripts/sqlsharp.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @plat_bindir@/sqlsharp.exe "$@"
+exec @bindir@/@mono_interp@ @mono_one_instdir@/sqlsharp.exe "$@"
diff --git a/scripts/wsdl.in b/scripts/wsdl.in
index 458c6427147..4133d23549e 100644
--- a/scripts/wsdl.in
+++ b/scripts/wsdl.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @plat_bindir@/wsdl.exe "$@"
+exec @bindir@/@mono_interp@ @mono_one_instdir@/wsdl.exe "$@"
diff --git a/scripts/wsdl2.in b/scripts/wsdl2.in
index b3e3bcdb9cb..aa9ebc72431 100644
--- a/scripts/wsdl2.in
+++ b/scripts/wsdl2.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @plat_bindir@/wsdl2.exe "$@"
+exec @bindir@/@mono_interp@ @mono_two_instdir@/wsdl2.exe "$@"
diff --git a/scripts/xsd.in b/scripts/xsd.in
index 6d5cc580bdf..51febb6ec24 100644
--- a/scripts/xsd.in
+++ b/scripts/xsd.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @plat_bindir@/xsd.exe "$@"
+exec @bindir@/@mono_interp@ @mono_one_instdir@/xsd.exe "$@"