diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | runtime/Makefile.am | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index e1dfafcac48..4cb828b18d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * runtime/Makefile.am (clean_profiles): Remove. (clean-local): Use $(build_profiles). (install-local, uninstall-local): Don't override $(prefix). + (SUPPORT_FILES): New. List of dependencies from ... + (all-local): ... here. Use it. + (install-local): Depend on $(SUPPORT_FILES). 2005-03-02 Zoltan Varga <vargaz@freemail.hu> diff --git a/runtime/Makefile.am b/runtime/Makefile.am index c5c4af1d14f..29954d13526 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -17,8 +17,10 @@ etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config $(symlinks): cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +SUPPORT_FILES = $(symlinks) mono-wrapper wrapper-config + # The write check is to foil 'make distcheck' -all-local: $(symlinks) mono-wrapper wrapper-config +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 PROFILES='$(build_profiles)' all-profiles @@ -32,7 +34,7 @@ endif install: install-exec install-data # override automake -install-exec: +install-exec: $(SUPPORT_FILES) d=`pwd`; \ cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \ RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles |