You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2013/02/15 17:57:20 UTC

svn commit: r1446686 - /subversion/trunk/Makefile.in

Author: julianfoad
Date: Fri Feb 15 16:57:20 2013
New Revision: 1446686

URL: http://svn.apache.org/r1446686
Log:
Don't break 'make install-tools' if TOOLSDIR is same as BINDIR.

* Makefile.in
  (INSTALL_EXTRA_TOOLS): Check that target and link_name are not the
    same before creating symlink to svnmucc in BINDIR.

Patch by: Alexander Thomas <alexander{_AT_}collab.net>

Modified:
    subversion/trunk/Makefile.in

Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1446686&r1=1446685&r2=1446686&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Fri Feb 15 16:57:20 2013
@@ -926,4 +926,6 @@ INSTALL_EXTRA_TOOLS=\
   $(MKDIR) $(DESTDIR)$(bindir); \
   test -n "$$SVN_SVNMUCC_IS_SVNSYITF" && \
   ln -sf svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \
-  ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
+  if test "$(DESTDIR)$(bindir)" != "$(DESTDIR)$(toolsdir)"; then \
+    ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
+  fi