* Makefile.am: Copy machine.config in the correct _tmpinst subdirectory.

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

diff --git a/ChangeLog b/ChangeLog
index 6201e620f850f6c91413312c151213e26f532166..61e1c67106ad91d46498822cd939c2f18f868488 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-29  Lluis Sanchez Gual  <lluis@novell.com>
+
+       * Makefile.am: Copy machine.config in the correct _tmpinst subdirectory.
+
 2004-07-28  Lluis Sanchez Gual  <lluis@novell.com>
 
        * configure.in: Added data/net_1_1 and data/net_2_0 to the build.

diff --git a/Makefile.am b/Makefile.am
index 4a0d5a4c42eccbdb4d608c3d864870b2a95e594b..d86ea5c6788ca450c1cc48f0796c98f108436a7d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -156,10 +156,10 @@ populate-runtime-subdir:
        rm -rf $(tmpinst)/prefix
 
 tmpinst-dir: 
-       mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/lib $(tmpinst)/etc/mono
+       mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/lib $(tmpinst)/etc/mono/1.0
        $(MAKE) tmpinst-dir-contents
 
-tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/machine.config
+tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/1.0/machine.config
 
 if PLATFORM_WIN32
 
@@ -190,9 +190,9 @@ $(tmpinst)/bin/mcs: $(srcdir)/Makefile.am
        (t=`cd $(tmpinst) && pwd`; echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$t/lib/mcs.exe"'" "$$@"') > $@
        chmod +x $@
 
-$(tmpinst)/etc/mono/machine.config: $(srcdir)/data/machine.config
+$(tmpinst)/etc/mono/1.0/machine.config: $(srcdir)/data/net_1_1/machine.config
        rm -f $@
-       srcdir=`cd $(srcdir) && pwd`; cd $(tmpinst)/etc/mono && $(LN_S) $$srcdir/data/machine.config machine.config
+       srcdir=`cd $(srcdir) && pwd`; cd $(tmpinst)/etc/mono/1.0 && $(LN_S) $$srcdir/data/net_1_1/machine.config machine.config
 
 # Obsolete target -- don't use.
 .PHONY: fullbuild