diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | runtime/Makefile.am | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 9865bf47095..f9a34bab8ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-09-19 Raja R Harinath <rharinath@novell.com> + + * runtime/Makefile.am (etc/mono/config): Fix rule to avoid writing + into a symlink created by the 2006-09-13 change below. + 2006-09-17 Zoltan Varga <vargaz@gmail.com> * docs/thread-safety.txt: Moved here from mono/metadata. diff --git a/runtime/Makefile.am b/runtime/Makefile.am index c0426d2495e..05e622d07d7 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -102,9 +102,10 @@ CLEANFILES = etc/mono/config # depend on $(symlinks) to ensure 'etc/mono' directory exists etc/mono/config: ../data/config Makefile $(symlinks) d=`cd ../support && pwd`; \ - sed 's,target="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",' ../data/config > $@ - if test -z "$(libgdiplus_loc)"; then :; else \ - mv $@ $@t; \ + sed 's,target="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",' ../data/config > $@t + if test -z "$(libgdiplus_loc)"; then \ + mv -f $@t $@; \ + else \ sed 's,<configuration>,& <dllmap dll="gdiplus.dll" target="$(libgdiplus_loc)" />,' $@t > $@; \ rm -f $@t; \ fi |