Updated Branches: refs/heads/master b9b1bdc81 -> 6bfba8bc7
TS-2359: force tstop symlink If you run "make install" a second time then "ln -s" will fail because the symlink already exists. Autoconf doesn't have a test for "ln -sf", so just remove the target beforehand. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6bfba8bc Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6bfba8bc Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6bfba8bc Branch: refs/heads/master Commit: 6bfba8bc7c752ec0ad2cd099da8473ebb15f66fc Parents: b9b1bdc Author: James Peach <[email protected]> Authored: Fri Nov 15 22:02:34 2013 -0800 Committer: James Peach <[email protected]> Committed: Sat Nov 16 20:34:30 2013 -0800 ---------------------------------------------------------------------- CHANGES | 3 +++ cmd/traffic_top/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6bfba8bc/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index d6327c2..8d47730 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 4.2.0 + + *) [TS-2359] Make install over existing installation can fail. + *) [TS-2350] Enhancements to traffic_top *) [TS-2348] Rename tstop to traffic_top. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6bfba8bc/cmd/traffic_top/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_top/Makefile.am b/cmd/traffic_top/Makefile.am index 292d350..51e45e5 100644 --- a/cmd/traffic_top/Makefile.am +++ b/cmd/traffic_top/Makefile.am @@ -36,5 +36,5 @@ traffic_top_LDADD = \ # Install a compatibility symlink because traffic_top was named tstop in previous releases. install-exec-hook: - cd $(DESTDIR)$(bindir) && $(LN_S) traffic_top tstop + cd $(DESTDIR)$(bindir) && $(RM) tstop && $(LN_S) traffic_top tstop endif
