You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2012/03/15 20:01:01 UTC

svn commit: r1301151 - /subversion/branches/svnmucc/Makefile.in

Author: danielsh
Date: Thu Mar 15 19:01:01 2012
New Revision: 1301151

URL: http://svn.apache.org/viewvc?rev=1301151&view=rev
Log:
On the svnmucc branch, make 'install tools' idempotent.

* Makefile.in
  (INSTALL_EXTRA_TOOLS): When creating a symlink, don't die if a file obstructs
     it; instead, silently overwrite that file.

Modified:
    subversion/branches/svnmucc/Makefile.in

Modified: subversion/branches/svnmucc/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/Makefile.in?rev=1301151&r1=1301150&r2=1301151&view=diff
==============================================================================
--- subversion/branches/svnmucc/Makefile.in (original)
+++ subversion/branches/svnmucc/Makefile.in Thu Mar 15 19:01:01 2012
@@ -878,5 +878,5 @@ subversion/libsvn_wc/wc-queries.h: $(abs
 INSTALL_EXTRA_TOOLS=\
   $(MKDIR) $(DESTDIR)$(bindir); \
   test -n "$$SVN_TRY_THIS_AT_HOME" && \
-  ln -s svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \
-  ln -s $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
+  ln -sf svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \
+  ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)