Author: raja
Date: 2005-04-25 09:43:06 -0400 (Mon, 25 Apr 2005)
New Revision: 43546

Modified:
   trunk/mono/ChangeLog
   trunk/mono/configure.in
   trunk/mono/runtime/Makefile.am
Log:
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.


Modified: trunk/mono/ChangeLog
===================================================================
--- trunk/mono/ChangeLog        2005-04-25 13:42:51 UTC (rev 43545)
+++ trunk/mono/ChangeLog        2005-04-25 13:43:06 UTC (rev 43546)
@@ -1,3 +1,12 @@
+2005-04-25  Raja R Harinath  <[EMAIL PROTECTED]>
+
+       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.
+
 2005-04-23  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * doc: Remove unused directory.

Modified: trunk/mono/configure.in
===================================================================
--- trunk/mono/configure.in     2005-04-25 13:42:51 UTC (rev 43545)
+++ trunk/mono/configure.in     2005-04-25 13:43:06 UTC (rev 43546)
@@ -1704,13 +1704,19 @@
   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}

Modified: trunk/mono/runtime/Makefile.am
===================================================================
--- trunk/mono/runtime/Makefile.am      2005-04-25 13:42:51 UTC (rev 43545)
+++ trunk/mono/runtime/Makefile.am      2005-04-25 13:43:06 UTC (rev 43546)
@@ -22,7 +22,7 @@
 # The write check is to foil 'make distcheck'
 all-local: $(SUPPORT_FILES)
        if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
-       d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper 
ILDISASM=$$d/monodis-wrapper PROFILES='$(build_profiles)' all-profiles
+       d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' 
all-profiles
 
 if INSTALL_2_0
 build_profiles = default net_2_0
@@ -36,8 +36,7 @@
 # override automake
 install-exec: $(SUPPORT_FILES)
        d=`pwd`; \
-       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \
-                                   RUNTIME=$$d/mono-wrapper 
ILDISASM=$$d/monodis-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles
+       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' 
RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles
 
 # override automake
 install-data:
@@ -46,8 +45,7 @@
 # override automake
 uninstall:
        d=`pwd`; \
-       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \
-                                   RUNTIME=$$d/mono-wrapper 
ILDISASM=$$d/monodis-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes 
uninstall-profiles
+       cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' 
RUNTIME_HAS_CONSISTENT_GACDIR=yes uninstall-profiles
 
 clean-local:
        d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' 
clean-profiles
@@ -67,11 +65,11 @@
 endif
 
 mcs-do-test-profiles:
-       d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper 
ILDISASM=$$d/monodis-wrapper PROFILES='$(build_profiles)' test-profiles
+       d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' 
test-profiles
 
 mcs-do-run-test-profiles: test-support-files
        d=`pwd`; PATH=$$d/$(tmpinst)/bin:$$PATH ; export PATH ; \
-       ( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper 
ILDISASM=$$d/monodis-wrapper PROFILES='$(build_profiles)' run-test-profiles ) 
|| ret=false ; \
+       ( cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' 
run-test-profiles ) || ret=false ; \
        rm -fr $(tmpinst); $$ret
 
 if PLATFORM_WIN32

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to