* runtime/Makefile.am (etc/mono/config): Fix rule to avoid writing

into a symlink created by the 2006-09-13 change below.

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

diff --git a/ChangeLog b/ChangeLog
index 9865bf4709541407b447e92931f5f65481eb5b14..f9a34bab8ac1a7de92e452a4c56a623b2266c921 100644 (file)
--- 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 c0426d2495e13b492df33839e05333e6887c0a7f..05e622d07d7152fca15963f17ca37927520604d6 100644 (file)
--- 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