diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | runtime/Makefile.am | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index a3c92e541a3..e1dfafcac48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-03-14 Raja R Harinath <rharinath@novell.com> + + * runtime/Makefile.am (clean_profiles): Remove. + (clean-local): Use $(build_profiles). + (install-local, uninstall-local): Don't override $(prefix). + 2005-03-02 Zoltan Varga <vargaz@freemail.hu> * docs/aot-compiler.txt: Add some more documentation. diff --git a/runtime/Makefile.am b/runtime/Makefile.am index c4ce77a5d64..c5c4af1d14f 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -24,10 +24,8 @@ all-local: $(symlinks) mono-wrapper wrapper-config if INSTALL_2_0 build_profiles = default net_2_0 -clean_profiles = basic net_1_1_bootstrap default net_2_0_bootstrap net_2_0 else build_profiles = default -clean_profiles = basic net_1_1_bootstrap default endif # override automake @@ -36,7 +34,7 @@ install: install-exec install-data # override automake install-exec: d=`pwd`; \ - cd $(mcs_topdir) && $(MAKE) prefix='$(exec_prefix)' PROFILES='$(build_profiles)' \ + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \ RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles # override automake @@ -46,11 +44,11 @@ install-data: # override automake uninstall: d=`pwd`; \ - cd $(mcs_topdir) && $(MAKE) prefix='$(exec_prefix)' PROFILES='$(build_profiles)' \ + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \ RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes uninstall-profiles clean-local: - d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(clean_profiles)' clean-profiles + d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles -rm -fr $(symlinks) $(tmpinst) .wapi if INSTALL_2_0 |