diff options
| author | Lluis Sanchez <lluis@novell.com> | 2004-07-29 12:47:47 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@novell.com> | 2004-07-29 12:47:47 +0400 |
| commit | af16fd3755bf89da040a62845bed72c5a769933e (patch) | |
| tree | 23990c549313224dfd679a66b093cab1053f8295 /Makefile.am | |
| parent | 918c727edba5f3020d359a449aaf29529018d7c7 (diff) | |
* Makefile.am: Copy machine.config in the correct _tmpinst subdirectory.
svn path=/trunk/mono/; revision=31598
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 4a0d5a4c42e..d86ea5c6788 100644 --- 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 |