* configure.in (AC_OUTPUT): Move runtime/Makefile to the end to

workaround a bug in automake 1.7.x.
* runtime/Makefile.am ($(symlinks)): Don't depend on config.status.

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

diff --git a/ChangeLog b/ChangeLog
index 1cf328395c5aa9efee38cc3325c30e43bb273f2a..390e41b2813ec2b3af895d37ad2a5c75d7c0f594 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-30  Raja R Harinath  <rharinath@novell.com>
+
+       * configure.in (AC_OUTPUT): Move runtime/Makefile to the end to
+       workaround a bug in automake 1.7.x.
+       * runtime/Makefile.am ($(symlinks)): Don't depend on config.status.
+
 2004-11-27  Miguel de Icaza  <miguel@ximian.com>
 
        * configure.in: Removed support for configured-based bundles. 

diff --git a/configure.in b/configure.in
index bc3f0657185ac5ff756580b7308939e64850a43d..47237e6a50477ed6782cfd4c11fd351d6710ece9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1546,7 +1546,6 @@ mono/handles/Makefile
 mono/mini/Makefile
 mono/profiler/Makefile
 ikvm-jni/Makefile
-runtime/Makefile
 scripts/Makefile
 man/Makefile
 web/Makefile
@@ -1560,6 +1559,7 @@ data/config
 mono.spec
 tools/Makefile
 tools/locale-builder/Makefile
+runtime/Makefile
 ])
 
 echo "

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index cf78b7fa9833a3c6802ca6c8308d83c1c5ca0cf3..a11eb6f3692cd93317df9f863c0e557b54bafb18 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -14,7 +14,7 @@ symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config
 etc/mono/1.0/machine.config: $(top_srcdir)/data/net_1_1/machine.config
 etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config
 
-$(symlinks): $(top_builddir)/config.status
+$(symlinks):
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 # The write check is to foil 'make distcheck'