Flush

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

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 808011dcb7159d2a779077a39562243c47c9eb3d..201d51d138af144a2d7cd1c0c436df86d777091d 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -28,14 +28,14 @@ monobins_DATA = \
        gacutil.exe                             \
        sn.exe
 
-fx11_DATA = \
+monoone_DATA = \
        mcs.exe                                 \
        mbas.exe
 
-fx20_DATA = \
+monotwo_DATA = \
        gmcs.exe
 
-EXTRA_DIST= $(monobins_DATA) $(fx11_DATA) $(fx20_DATA)
+EXTRA_DIST= $(monobins_DATA) $(monoone_DATA) $(monotwo_DATA)
 
 MAINTAINERCLEANFILES = $(EXTRA_DIST)
 
@@ -44,15 +44,15 @@ MAINTAINERCLEANFILES = $(EXTRA_DIST)
 #
 if PLATFORM_WIN32
 monobinsdir = $(libdir)
-fx11dir = $(libdir)
-fx20dir = $(libdir)
+monoonedir = $(libdir)
+monotwodir = $(libdir)
 else
 monobinsdir = $(bindir)
-fx11dir = $(libdir)/mono/1.1/
-fx20dir = $(libdir)/mono/2.0/
+monoonedir = $(libdir)/mono/1.0/
+monotwodir = $(libdir)/mono/2.0/
 endif
 
-$(fx11_DATA):
+$(monoone_DATA):
        if test -f $(mcs_topdir)/mcs/mcs.exe; then f=$(mcs_topdir)/mcs/mcs.exe; else f=$(fx11dir)/mcs.exe; fi; \
        echo "cp -f $$f $(srcdir)"; \
        cp -f $$f $(srcdir)
@@ -60,7 +60,7 @@ $(fx11_DATA):
        echo "cp -f $$f $(srcdir)"; \
        cp -f $$f $(srcdir)
 
-$(fx20_DATA):
+$(monotwo_DATA):
        if test -f $(mcs_topdir)/gmcs/gmcs.exe; then f=$(mcs_topdir)/gmcs/gmcs.exe; else f=$(fx20dir)/gmcs.exe; fi; \
        echo "cp -f $$f $(srcdir)"; \
        cp -f $$f $(srcdir)

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 2a48f6ecd6d54a70877206a53817b3c96fcec68c..151b9b34cb1799efc6159d651528c0c9635a5bfb 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -19,13 +19,14 @@ plat_bindir = $(bindir)
 mono_one_instdir = $(libdir)/mono/1.0
 mono_two_instdir = $(libdir)/mono/2.0
 endif
+gtkdir = $(libdir)/mono/gtk-sharp
 
 mcs: mcs.in
-       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 \
+       sed -e 's^\@gtkdir\@^$(gtkdir)^g' -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^\@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 \
+       sed -e 's^\@gtkdir\@^$(gtkdir)^g' -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

diff --git a/scripts/mcs.in b/scripts/mcs.in
index f8ce4ffad06711fea6dddd85fde2d6d2d8d2fb68..73e3ed59496841efe35f87ae619e98fc01001b90 100644 (file)
--- a/scripts/mcs.in
+++ b/scripts/mcs.in
@@ -1,2 +1,6 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/mcs.exe "$@"
+# 
+# Yes, the -lib: there is required, in preparation for Beta2, remove
+# this script at your own risk
+#
+exec @bindir@/@mono_interp@ @mono_one_instdir@/mcs.exe -lib:@gtkdir@ "$@"