diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | mono/Makefile.am | 11 | ||||
| -rw-r--r-- | runtime/Makefile.am | 4 |
4 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 4338328cd47..dac021becf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-12-03 Raja R Harinath <rharinath@novell.com> + + * Makefile.am (dist-hook): Ensure we use the 'default' profile. + * mono/Makefile.am (HANDLES): New. Disable 'handles' dir on Win32. + (SUBDIRS): Use it. Move 'cil' before 'metadata'. + * runtime/Makefile.am (install-exec): Pass + RUNTIME_HAS_CONSISTENT_GACDIR to the mcs/ build. + 2004-12-01 Neale Ferguson <Neale.Ferguson@SoftwareAG-usa.com> * configure.in : Add a flag for systems which pass parameters in diff --git a/Makefile.am b/Makefile.am index 68155a88387..164f178132f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in # Distribute the 'mcs' tree too dist-hook: test -d $(distdir)/mcs || mkdir $(distdir)/mcs - d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive + d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=default distdir=$$d dist-recursive pkgconfigdir = $(libdir)/pkgconfig if JIT_SUPPORTED diff --git a/mono/Makefile.am b/mono/Makefile.am index 17162963cd1..0c1c2e3ad53 100644 --- a/mono/Makefile.am +++ b/mono/Makefile.am @@ -1,8 +1,7 @@ # the handles dir doesn't apply to windows -if PLATFORM_WIN32 -SUBDIRS = utils io-layer monoburg os metadata cil dis \ - arch monograph interpreter mini tests benchmark profiler -else -SUBDIRS = utils io-layer monoburg os metadata cil dis \ - arch monograph interpreter mini tests benchmark handles profiler +if ! PLATFORM_WIN32 +HANDLES = handles endif + +SUBDIRS = utils io-layer monoburg os cil metadata dis \ + arch monograph interpreter mini tests benchmark $(HANDLES) profiler diff --git a/runtime/Makefile.am b/runtime/Makefile.am index a11eb6f3692..1944612be07 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -35,7 +35,9 @@ install: install-exec install-data # override automake install-exec: - d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper prefix=$(exec_prefix) PROFILES='$(build_profiles)' install-profiles + d=`pwd`; \ + cd $(mcs_topdir) && $(MAKE) prefix='$(exec_prefix)' PROFILES='$(build_profiles)' \ + RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles # override automake install-data: |