1.0 instead of 1.1

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

diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am
index b5bdc479b27a3f119e4ca69c0a5e7cb1b5aa718c..5a798683f0e8100cbaaee4d8a0bfcb4a277ca0a6 100644 (file)
--- a/runtime/net_1_1/Makefile.am
+++ b/runtime/net_1_1/Makefile.am
@@ -84,9 +84,9 @@ all-local: $(gac_assemblies)
 install-data-local:
        @if test -n '$(gac_assemblies)'; then \
          for i in ''$(gac_assemblies); do \
-           echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) -i $(srcdir)/$$i /f /package 1.1 /root $(DESTDIR)$(libdir)" ; \
+           echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) -i $(srcdir)/$$i /f /package 1.0 /root $(DESTDIR)$(libdir)" ; \
            MONO_PATH=$(srcdir) \
-             $(mono_runtime) $(gacutil) -i $(srcdir)/$$i /f /package 1.1 /root $(DESTDIR)$(libdir) || exit 1 ; \
+             $(mono_runtime) $(gacutil) -i $(srcdir)/$$i /f /package 1.0 /root $(DESTDIR)$(libdir) || exit 1 ; \
          done; fi
 
 uninstall-local:

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 02e5fc5675985c4926ec3d652a25dbb0a9dbd5c1..2a48f6ecd6d54a70877206a53817b3c96fcec68c 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -12,24 +12,24 @@ endif
 
 if PLATFORM_WIN32
 plat_bindir = $(shell cygpath -m $(libdir))
-fx11_instdir = $(shell cygpath -m $(libdir))/mono/1.1/
-fx20_instdir = $(shell cygpath -m $(libdir))/mono/2.0/
+mono_one_instdir = $(shell cygpath -m $(libdir))/mono/1.0
+monO_two_instdir = $(shell cygpath -m $(libdir))/mono/2.0
 else
 plat_bindir = $(bindir)
-fx11_instdir = $(libdir)/mono/1.1/
-fx20_instdir = $(libdir)/mono/2.0/
+mono_one_instdir = $(libdir)/mono/1.0
+mono_two_instdir = $(libdir)/mono/2.0
 endif
 
 mcs: mcs.in
-       sed -e 's^\@fx11_instdir\@^$(fx11_instdir)^g' -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mcs.in > mcs.tmp \
+       sed -e 's^\@mono_one_instdir\@^$(mono_one_instdir)^g' -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mcs.in > mcs.tmp \
        && mv mcs.tmp mcs
 
 gmcs: gmcs.in
-       sed -e 's^\@fx20_instdir\@^$(fx20_instdir)^g' -e 's^\@bindir\@^$(bindir)^g' -e 's^\@libdir\@^$(libdir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/gmcs.in > gmcs.tmp \
+       sed -e 's^\@mono_two_instdir\@^$(mono_two_instdir)^g' -e 's^\@bindir\@^$(bindir)^g' -e 's^\@libdir\@^$(libdir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/gmcs.in > gmcs.tmp \
        && mv gmcs.tmp gmcs 
 
 mbas: mbas.in
-       sed -e 's^\@fx11_instdir\@^$(fx11_instdir)^g' -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mbas.in > mbas.tmp \
+       sed -e 's^\@mono_one_instdir\@^$(mono_one_instdir)^g' -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mbas.in > mbas.tmp \
        && mv mbas.tmp mbas 
 
 ilasm: ilasm.in

diff --git a/scripts/gmcs.in b/scripts/gmcs.in
index e35df44d1bb3fb661b8a715977260d7ec7f8d663..704dcf29ae9e77899595e01d6c50967549bbe8dc 100644 (file)
--- a/scripts/gmcs.in
+++ b/scripts/gmcs.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-MONO_PATH="@fx20_instdir@:$MONO_PATH" exec @bindir@/@mono_interp@ @fx20_instdir@/gmcs.exe "$@"
+MONO_PATH="@mono_two_instdir@:$MONO_PATH" exec @bindir@/@mono_interp@ @mono_two_instdir@/gmcs.exe "$@"

diff --git a/scripts/mbas.in b/scripts/mbas.in
index 28c3c634a31aa1703c1908114381def61474fe90..6860e8db14c625c5fac7a19c0618b2e86eec1800 100644 (file)
--- a/scripts/mbas.in
+++ b/scripts/mbas.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @fx11_instdir@/mbas.exe "$@"
+exec @bindir@/@mono_interp@ @mono_one_instdir@/mbas.exe "$@"

diff --git a/scripts/mcs.in b/scripts/mcs.in
index 679a0eab85ca9cf8a1440ea6ea660ce4ad9af55b..f8ce4ffad06711fea6dddd85fde2d6d2d8d2fb68 100644 (file)
--- a/scripts/mcs.in
+++ b/scripts/mcs.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @fx11_instdir@/mcs.exe "$@"
+exec @bindir@/@mono_interp@ @mono_one_instdir@/mcs.exe "$@"