diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7cf930f421b..c65247584af 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 27 16:26:11 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* Makefile.in (all-gdbtk): Check for an existing link/directory.
+  	Re-format warning message.  Document that post 5.0 this can be
+ 	deleted.
+
 Mon Mar 27 14:46:37 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* ChangeLog: Revert whitespace changes.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 60464323897..f77a7e3036f 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1260,15 +1260,23 @@ findvar.o: findvar.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \
 fork-child.o: fork-child.c gdb_wait.h $(defs_h) $(gdbcore_h) \
 	$(inferior_h) target.h terminal.h gdbthread.h gdb_string.h
 
+# FIXME: cagney/2000-03-27: Post 5.0 this link code can be removed.
+# It should now be possible to run GDBtk from the build directory
+# without the link in place.
 all-gdbtk:
-	if test "$(LN_S)" = "ln -s" -a ! -d gdbtcl/images ; then \
-	  echo linking ${srcdir}/gdbtk/library to gdbtcl ; \
-	  $(LN_S) ${srcdir}/gdbtk/library gdbtcl ; \
-	else \
-	  echo Warning: Unable to link ${srcdir}/gdbtk/library to gdbtcl. ; \
-	  echo "         " You will need to do a ; \
-	  echo "         " make install before you are able to run the GUI. ; \
-	fi
+	@if test ! -d gdbtcl/images ; then \
+	  if test "$(LN_S)" = "ln -s" ; then \
+	    echo linking ${srcdir}/gdbtk/library to gdbtcl ; \
+	    rm -f gdbtcl ; \
+	    test ! -r gdbtcl || exit 1 ; \
+	    $(LN_S) ${srcdir}/gdbtk/library gdbtcl ; \
+	  else \
+	    echo "Warning:" ; \
+	    echo "Unable to link ${srcdir}/gdbtk/library to gdbtcl." ; \
+	    echo "You will need to do a \`make install' before you are" ; \
+	    echo "able to run the GUI." ; \
+	  fi ; \
+	else true ; fi
 
 clean-gdbtk:
 	rm -f gdbtcl