diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2004-05-03 20:21:01 +0400 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2004-05-03 20:21:01 +0400 |
| commit | 598ab05160412a5e065be762de43a98da680f4a4 (patch) | |
| tree | 00faff4401b4cb3f7d52c21596e5b1b150601a90 /scripts | |
| parent | 401825e0c2815948ed470e08b3723858819e4430 (diff) | |
Add --with-icu=yes/no
Add --with-preview=yes/no
Install mcs/mbas into $prefix/lib/mono/1.1
Install gmcs into $prefix/lib/mono/2.0
This is in preparation for the dual installation of libraries GAC + devel.
svn path=/trunk/mono/; revision=26599
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 12 | ||||
| -rw-r--r-- | scripts/gmcs.in | 2 | ||||
| -rw-r--r-- | scripts/mbas.in | 2 | ||||
| -rw-r--r-- | scripts/mcs.in | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 9239cde1513..4515e4b60a5 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -12,20 +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/ else -plat_bindir = $(bindir) +plat_bindir = $(bindir)/mono +fx11_instdir = $(libdir)/mono/1.1/ +fx20_instdir = $(libdir)/mono/2.0/ endif mcs: mcs.in - sed -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^\@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 \ && mv mcs.tmp mcs gmcs: gmcs.in - sed -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^\@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 \ && mv gmcs.tmp gmcs mbas: mbas.in - sed -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^\@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 \ && mv mbas.tmp mbas ilasm: ilasm.in diff --git a/scripts/gmcs.in b/scripts/gmcs.in index c6fa8b50b07..e35df44d1bb 100644 --- a/scripts/gmcs.in +++ b/scripts/gmcs.in @@ -1,2 +1,2 @@ #!/bin/sh -MONO_PATH="@libdir@//net_2_0:$MONO_PATH" exec @bindir@/@mono_interp@ @plat_bindir@/gmcs.exe "$@" +MONO_PATH="@fx20_instdir@:$MONO_PATH" exec @bindir@/@mono_interp@ @fx20_instdir@/gmcs.exe "$@" diff --git a/scripts/mbas.in b/scripts/mbas.in index 691a624045a..28c3c634a31 100644 --- a/scripts/mbas.in +++ b/scripts/mbas.in @@ -1,2 +1,2 @@ #!/bin/sh -exec @bindir@/@mono_interp@ @plat_bindir@/mbas.exe "$@" +exec @bindir@/@mono_interp@ @fx11_instdir@/mbas.exe "$@" diff --git a/scripts/mcs.in b/scripts/mcs.in index 76536980bb2..679a0eab85c 100644 --- a/scripts/mcs.in +++ b/scripts/mcs.in @@ -1,2 +1,2 @@ #!/bin/sh -exec @bindir@/@mono_interp@ @plat_bindir@/mcs.exe "$@" +exec @bindir@/@mono_interp@ @fx11_instdir@/mcs.exe "$@" |