Third pass

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

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b301ff5df55719841d3178aea52d48846b459de8..897230d3c1f36a530db41c54b343d9b00fdd9fca 100644 (file)
--- 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 cc83c1364544d8394d1bc9b4aa2fd79f46ca656a..93111b7b698d0b9f06e3abdb0affb1a25cbbe0b9 100644 (file)
--- 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 ba15bd4f22cbb88e191977358f8f0435a0ca5cd7..eb76952f4e4d4e60229ce678edb2976f0bfaf5e0 100644 (file)
--- 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 c1ae8c95f77956f8e4ecac7c0fbd9d944e70f44c..ed5cc077b6a9af1af19ec723de9e083416435a59 100644 (file)
--- 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 f68edb31e3f241b14f194323e48b93a4b1e8f7cd..2ef075e7429e06ae3ba8d6f442e55e523f27c57a 100644 (file)
--- 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 b50ebeeb6afdb5f74e57e0676c811a3dcf6ed67e..fd4bec7fd3850b268fff3f21f7e08fff69113d39 100644 (file)
--- 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 b50ebeeb6afdb5f74e57e0676c811a3dcf6ed67e..fd4bec7fd3850b268fff3f21f7e08fff69113d39 100644 (file)
--- 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 8c7dfe5eb5256d97f0b53d20c20e2f6c23bbe64b..5dcb9341dc34c294286a8a55350ac691ccb549dc 100644 (file)
--- 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 f93bf07e8733d9218e63d4c757e38418079cdc99..d31ae17d270eeaec0b4cfa773cc8296598166f83 100644 (file)
--- 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 458c64271475b4224bc8e577fecf4a7cd2f4d723..4133d23549eeeb910af0d042947c019fbc3202d6 100644 (file)
--- 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 b3e3bcdb9cb00c850160c7c04df357a45b14ab09..aa9ebc7243170d12ae02e47f6d45800710047b37 100644 (file)
--- 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 6d5cc580bdf2d76cbb4d7773b9c086402e869b3b..51febb6ec24a845655a3bf24f15511aa9ab7ff7e 100644 (file)
--- 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 "$@"