diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2005-04-25 17:43:06 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2005-04-25 17:43:06 +0400 |
| commit | 7fdb965fb816e78911310c0aaa283c2ce45a060f (patch) | |
| tree | 0e9a9337a8a06630c3e7ab4cf5b3e83b48ba76c2 /configure.in | |
| parent | 5319634c9b355ca01ee9baa276b29b211335e820 (diff) | |
Fix #74692.
* configure.in ($mcsdir/build/config.make): Point RUNTIME and
ILDISASM to the in-tree versions of mono and monodis. Propagate
value of INSTALL to mcs too.
* runtime/Makefile.am: Avoid passing RUNTIME and ILDISASM to each
sub-make, now that 'configure' sets up the 'mcs' tree.
svn path=/trunk/mono/; revision=43546
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 6c330d364fc..cfbdc133f07 100644 --- a/configure.in +++ b/configure.in @@ -1704,13 +1704,19 @@ runtime/Makefile NONE) prefix=$ac_default_prefix ;; esac case $exec_prefix in - NONE ) exec_prefix='${prefix}' ;; + NONE) exec_prefix='${prefix}' ;; esac + test -w $srcdir/$mcsdir/build || chmod +w $srcdir/$mcsdir/build + echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make + echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make + echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make + echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make + echo "INSTALL = $INSTALL" >> $srcdir/$mcsdir/build/config.make ) libgdiplus_msg=${libgdiplus_loc:-assumed to be installed} |