* runtime/Makefile.am (all-local): Make mcs/ tree writeable if necessary.

(distdir): New.  Using 'cygnus' option disables the automake rule.

svn path=/trunk/mono/; revision=36542

diff --git a/ChangeLog b/ChangeLog
index 7f1daa27dcd6d0ccdf0ea51ccd1a277ed74a26c7..ae7095f4e04900965a2f91d1bd9315d7d361bd6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-25  Raja R Harinath  <rharinath@novell.com>
+
+       * runtime/Makefile.am (all-local): Make mcs/ tree writeable if
+       necessary.
+       (distdir): New.  Using 'cygnus' option disables the automake rule.
+
 2004-11-25  Raja R Harinath  <rharinath@novell.com>
 
        * runtime/Makefile.am (check-local): Use $(mkinstalldirs).

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index a8b33f7937f3cf4fa0b61d13967da66aab329d20..a11eb6f3692cd93317df9f863c0e557b54bafb18 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -17,7 +17,9 @@ etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config
 $(symlinks):
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
+# The write check is to foil 'make distcheck'
 all-local: $(symlinks) mono-wrapper
+       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
 
 if INSTALL_2_0
@@ -78,3 +80,13 @@ $(tmpinst)/bin/pedump: $(srcdir)/Makefile.am
        $(mkdir_p) $(@D)
        (b=`pwd`; echo '#! /bin/sh'; echo 'exec "'"$$b/libtool"'" --mode=execute "'"$$b/mono/metadata/pedump"'" "$$@"') > $@
        chmod +x $@
+
+# the 'cygnus' option also disables the default 'distdir:' target, which we _do_ want
+MYDISTFILES = Makefile.am Makefile.in mono-wrapper.in
+distdir: $(MYDISTFILES)
+       rm -fr $(distdir)
+       mkdir $(distdir)
+       test -z '$(MYDISTFILES)' || for file in ''$(MYDISTFILES); do \
+         if test -f $$file; then d=.; else d=$(srcdir); fi; \
+         cp -p $$d/$$file $(distdir) ; done
+       find $(distdir) -type f -exec chmod a+r {} ';'