diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2004-05-04 01:41:59 +0400 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2004-05-04 01:41:59 +0400 |
| commit | 466b4c0feced6f2a2a8a4ddaebe11500919a2710 (patch) | |
| tree | e03c6225af8ca9bb9ea709a32ba84faa6917130f | |
| parent | 7d49d4eb0f4b2a305584ed529ce69b52e070fddb (diff) | |
Flush
svn path=/trunk/mono/; revision=26646
| -rw-r--r-- | runtime/Makefile.am | 18 | ||||
| -rw-r--r-- | scripts/Makefile.am | 5 | ||||
| -rw-r--r-- | scripts/mcs.in | 6 |
3 files changed, 17 insertions, 12 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 808011dcb71..201d51d138a 100644 --- 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 2a48f6ecd6d..151b9b34cb1 100644 --- 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 f8ce4ffad06..73e3ed59496 100644 --- 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@ "$@" |