You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/08/23 17:22:28 UTC
svn commit: r988149 - in /trafficserver/traffic/branches/2.0.x: ./ proxy/
proxy/config/ proxy/mgmt2/ proxy/mgmt2/cop/ proxy/mgmt2/html2/
proxy/mgmt2/html2/agent-installer/ proxy/mgmt2/html2/charting/
proxy/mgmt2/html2/configure/ proxy/mgmt2/html2/confi...
Author: zwoop
Date: Mon Aug 23 15:22:26 2010
New Revision: 988149
URL: http://svn.apache.org/viewvc?rev=988149&view=rev
Log:
Backport of TS-336 from trunk to 2.0.x branch
Modified:
trafficserver/traffic/branches/2.0.x/ (props changed)
trafficserver/traffic/branches/2.0.x/CHANGES
trafficserver/traffic/branches/2.0.x/STATUS
trafficserver/traffic/branches/2.0.x/configure.ac
trafficserver/traffic/branches/2.0.x/proxy/Makefile.am
trafficserver/traffic/branches/2.0.x/proxy/config/records.config.in
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/LocalManager.cc
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/cop/Makefile.am
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/cop/TrafficCop.cc
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/Makefile.am
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/agent-installer/Makefile.am
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/charting/Makefile.am
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/Makefile.am
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/helper/Makefile.am
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/images/Makefile.am
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/include/Makefile.am
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/monitor/Makefile.am
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/mrtg/Makefile.am
trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/tune/Makefile.am
trafficserver/traffic/branches/2.0.x/rc/trafficserver.in
Propchange: trafficserver/traffic/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 23 15:22:26 2010
@@ -1 +1,2 @@
/incubator/trafficserver/traffic/trunk:921639,921965,922056,923986,926907,936014
+/trafficserver/traffic/trunk:941910,942639
Modified: trafficserver/traffic/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/CHANGES?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/2.0.x/CHANGES Mon Aug 23 15:22:26 2010
@@ -5,6 +5,8 @@ Changes with Apache Traffic Server 2.0.1
*) Backport part of TS-322 that deals with indexing arrays with char
(author: Marcus Ruckert) [TS-334].
+ *) Backport TS-336 to 2.0.x. Problems with make install DESTDIR=...
+
Changes with Apache Traffic Server 2.0.0
Modified: trafficserver/traffic/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/STATUS?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/STATUS (original)
+++ trafficserver/traffic/branches/2.0.x/STATUS Mon Aug 23 15:22:26 2010
@@ -103,6 +103,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
Jira: https://issues.apache.org/jira/browse/TS-334
+1: bcall, zwoop, georgep
+ * build: Problems with make install DESTDIR=...
+ Trunk patch: http://svn.apache.org/viewvc?rev=941910&view=rev
+ Trunk Patch: http://svn.apache.org/viewvc?rev=942639&view=rev
+ Jira: http://issues.apache.org/jira/browse/TS-336
+ +1: zwoop, georgep, mturk
+
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
@@ -116,12 +122,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Jira: https://issues.apache.org/jira/browse/TS-162
+1: bcall, zwoop
- * build: Problems with make install DESTDIR=...
- Trunk patch: http://svn.apache.org/viewvc?rev=941910&view=rev
- Trunk Patch: http://svn.apache.org/viewvc?rev=942639&view=rev
- Jira: http://issues.apache.org/jira/browse/TS-336
- +1: zwoop, georgep, mturk
-
RELEASE PROCESS
The Traffic Server release process is documented at
Modified: trafficserver/traffic/branches/2.0.x/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/configure.ac?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/configure.ac (original)
+++ trafficserver/traffic/branches/2.0.x/configure.ac Mon Aug 23 15:22:26 2010
@@ -27,7 +27,7 @@
# -----------------------------------------------------------------------------
# 1. INITIALIZATION
-AC_INIT([Apache Traffic Server], [2.0.0], [dev@trafficserver.apache.org], [trafficserver], [http://trafficserver.apache.org/])
+AC_INIT([Apache Traffic Server], [2.0.1], [dev@trafficserver.apache.org], [trafficserver], [http://trafficserver.apache.org/])
AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([tar-ustar -Wall -Werror foreign no-installinfo no-installman 1.9.2])
@@ -313,6 +313,17 @@ AC_SUBST([pkglibexecdir],["$libexecdir/t
# default: /usr/local/share/trafficserver
AC_SUBST([pkgdatadir],["$datadir/trafficserver"])
+# default: /usr/local/bin
+if test "$exec_prefix" = NONE ; then
+ if test "$prefix" = NONE ; then
+ AC_SUBST([pkgbindir],["$ac_default_prefix/bin"])
+ else
+ AC_SUBST([pkgbindir],["$prefix/bin"])
+ fi
+else
+ AC_SUBST([pkgbindir],["$exec_prefix/bin"])
+fi
+
# -----------------------------------------------------------------------------
# 3. CHECK FOR PROGRAMS
Modified: trafficserver/traffic/branches/2.0.x/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/Makefile.am?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/Makefile.am (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/Makefile.am Mon Aug 23 15:22:26 2010
@@ -394,7 +394,7 @@ test_ClusterHashStandalone_LDADD = libCl
test_xml_parser_SOURCES = test_xml_parser.cc InkXml.cc DiagsConfig.cc
-versiondir = $(DESTDIR)$(pkglocalstatedir)
+versiondir = $(pkglocalstatedir)
dist_version_DATA = TS_version
install-data-local:
Modified: trafficserver/traffic/branches/2.0.x/proxy/config/records.config.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/config/records.config.in?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/config/records.config.in (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/config/records.config.in Mon Aug 23 15:22:26 2010
@@ -20,7 +20,7 @@
#
##############################################################################
CONFIG proxy.config.proxy_name STRING <proxy_name>
-CONFIG proxy.config.bin_path STRING bin
+CONFIG proxy.config.bin_path STRING @pkgbindir@
CONFIG proxy.config.proxy_binary STRING traffic_server
CONFIG proxy.config.proxy_binary_opts STRING -M
CONFIG proxy.config.manager_binary STRING traffic_manager
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/LocalManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/LocalManager.cc?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/LocalManager.cc (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/LocalManager.cc Mon Aug 23 15:22:26 2010
@@ -390,10 +390,20 @@ BaseManager(), run_proxy(proxy_on), reco
proxy_options = REC_readString("proxy.config.proxy_binary_opts", &found);
env_prep = REC_readString("proxy.config.env_prep", &found);
- const size_t absolute_proxy_binary_size = sizeof(char) * (strlen(bin_path) + strlen(proxy_binary)) + 2;
+ const size_t absolute_proxy_binary_size = sizeof(char) * (strlen(system_root_dir) + strlen(bin_path) + strlen(proxy_binary)) + 2;
absolute_proxy_binary = (char *) xmalloc(absolute_proxy_binary_size);
snprintf(absolute_proxy_binary, absolute_proxy_binary_size, "%s%s%s", bin_path, DIR_SEP, proxy_binary);
+ if ((err = stat(absolute_proxy_binary, &s)) < 0) {
+ // Try 'root_dir/bin_path' directory
+ snprintf(absolute_proxy_binary, absolute_proxy_binary_size, "%s%s%s%s", system_root_dir,bin_path, DIR_SEP, proxy_binary);
+ // coverity[fs_check_call]
+ if ((err = stat(absolute_proxy_binary, &s)) < 0) {
+ mgmt_elog("[LocalManager::LocalManager] Unable to find '%s': %d %d, %s\n",
+ absolute_proxy_binary, err, errno, strerror(errno));
+ mgmt_fatal("[LocalManager::LocalManager] please set bin path 'proxy.config.bin_path' \n");
+ }
+ }
internal_ticker = 0;
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/cop/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/cop/Makefile.am?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/cop/Makefile.am (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/cop/Makefile.am Mon Aug 23 15:22:26 2010
@@ -27,6 +27,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/web2 \
-I$(top_srcdir)/proxy \
-DPREFIX=\"$(prefix)\" \
+ -DBINDIR=\"$(bindir)\" \
-DPKGLOCALSTATEDIR=\"$(pkglocalstatedir)\" \
-DPKGLOGDIR=\"$(pkglogdir)\" \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/cop/TrafficCop.cc?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/cop/TrafficCop.cc Mon Aug 23 15:22:26 2010
@@ -90,7 +90,7 @@ static char server_binary[PATH_MAX] = "t
static char manager_options[OPTIONS_LEN_MAX] = "";
static char log_file[PATH_MAX] = "logs/traffic.out";
-static char bin_path[PATH_MAX] = "bin";
+static char bin_path[PATH_MAX] = BINDIR;
static int autoconf_port = 8083;
static int rs_port = 8088;
@@ -880,6 +880,16 @@ spawn_manager()
}
snprintf(prog, sizeof(prog), "%s%s%s", bin_path, DIR_SEP, manager_binary);
+ if (stat(prog, &info) < 0) {
+ // Try 'root_dir/bin_path' directory
+ snprintf(prog, sizeof(prog), "%s%s%s%s", root_dir,bin_path, DIR_SEP, manager_binary);
+ // coverity[fs_check_call]
+ if (stat(prog, &info) < 0) {
+ cop_log(COP_FATAL, "unable to find manager binary \"%s\" [%d '%s']\n", prog, errno, strerror(errno));
+ exit(1);
+ }
+ }
+
#ifdef TRACE_LOG_COP
cop_log(COP_DEBUG, "spawn_manager: Launching %s with options '%s'\n",
prog, manager_options);
@@ -896,11 +906,6 @@ spawn_manager()
options[i++] = tok;
}
- // coverity[fs_check_call]
- if (stat(prog, &info) < 0) {
- cop_log(COP_FATAL, "unable to find manager binary \"%s\" [%d '%s']\n", prog, errno, strerror(errno));
- exit(1);
- }
// Move any traffic.out that we can not write to, out
// of the way (INKqa2232)
// coverity[fs_check_call]
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/Makefile.am?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/Makefile.am (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/Makefile.am Mon Aug 23 15:22:26 2010
@@ -34,7 +34,7 @@ install-data-local:
uninstall-hook:
-rm -rf $(DESTDIR)$(pkgdatadir)
-webuidir = $(DESTDIR)$(pkgdatadir)
+webuidir = $(pkgdatadir)
dist_webui_DATA = \
checkCookies.ink \
enableCookies.ink \
@@ -46,4 +46,4 @@ dist_webui_DATA = \
rename.ink \
resize.js \
restart.ink \
- ssl_redirect.ink
\ No newline at end of file
+ ssl_redirect.ink
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/agent-installer/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/agent-installer/Makefile.am?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/agent-installer/Makefile.am (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/agent-installer/Makefile.am Mon Aug 23 15:22:26 2010
@@ -15,7 +15,7 @@
# limitations under the License.
-webuidir = $(DESTDIR)$(pkgdatadir)/agent-installer
+webuidir = $(pkgdatadir)/agent-installer
dist_webui_DATA = \
ftp.exp \
ftp.pl \
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/charting/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/charting/Makefile.am?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/charting/Makefile.am (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/charting/Makefile.am Mon Aug 23 15:22:26 2010
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(DESTDIR)$(pkgdatadir)/charting
+webuidir = $(pkgdatadir)/charting
dist_webui_DATA = \
Bandwidth_Savings.html \
Cache_Percent_Free.html \
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/Makefile.am?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/Makefile.am (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/Makefile.am Mon Aug 23 15:22:26 2010
@@ -16,7 +16,7 @@
SUBDIRS = helper
-webuidir = $(DESTDIR)$(pkgdatadir)/configure
+webuidir = $(pkgdatadir)/configure
dist_webui_DATA = \
c_autoconf_pac.ink \
c_autoconf_wpad.ink \
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/helper/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/helper/Makefile.am?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/helper/Makefile.am (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/helper/Makefile.am Mon Aug 23 15:22:26 2010
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(DESTDIR)$(pkgdatadir)/configure/helper
+webuidir = $(pkgdatadir)/configure/helper
dist_webui_DATA = \
INKMgmtAPICheckTcl.sh \
INKMgmtAPIFtp.tcl \
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/images/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/images/Makefile.am?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/images/Makefile.am (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/images/Makefile.am Mon Aug 23 15:22:26 2010
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(DESTDIR)$(pkgdatadir)/images
+webuidir = $(pkgdatadir)/images
dist_webui_DATA = \
arrow_add.gif \
arrow_cross.gif \
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/include/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/include/Makefile.am?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/include/Makefile.am (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/include/Makefile.am Mon Aug 23 15:22:26 2010
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(DESTDIR)$(pkgdatadir)/include
+webuidir = $(pkgdatadir)/include
dist_webui_DATA = \
body_footer.ink \
body_header.ink \
@@ -25,4 +25,4 @@ dist_webui_DATA = \
html_footer.ink \
html_header.ink \
tree_footer.ink \
- tree_header.ink
\ No newline at end of file
+ tree_header.ink
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/monitor/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/monitor/Makefile.am?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/monitor/Makefile.am (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/monitor/Makefile.am Mon Aug 23 15:22:26 2010
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(DESTDIR)$(pkgdatadir)/monitor
+webuidir = $(pkgdatadir)/monitor
dist_webui_DATA = \
m_alarm.ink \
m_blue_bar.ink \
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/mrtg/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/mrtg/Makefile.am?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/mrtg/Makefile.am (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/mrtg/Makefile.am Mon Aug 23 15:22:26 2010
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(DESTDIR)$(pkgdatadir)/mrtg
+webuidir = $(pkgdatadir)/mrtg
dist_webui_DATA = \
detailed.ink \
- overview.ink
\ No newline at end of file
+ overview.ink
Modified: trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/tune/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/tune/Makefile.am?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/tune/Makefile.am (original)
+++ trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/tune/Makefile.am Mon Aug 23 15:22:26 2010
@@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(DESTDIR)$(pkgdatadir)/tune
+webuidir = $(pkgdatadir)/tune
dist_webui_DATA = \
navigation_tree.xmlcpp
Modified: trafficserver/traffic/branches/2.0.x/rc/trafficserver.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/2.0.x/rc/trafficserver.in?rev=988149&r1=988148&r2=988149&view=diff
==============================================================================
--- trafficserver/traffic/branches/2.0.x/rc/trafficserver.in (original)
+++ trafficserver/traffic/branches/2.0.x/rc/trafficserver.in Mon Aug 23 15:22:26 2010
@@ -76,11 +76,11 @@ TS_ROOT=${TS_ROOT:-$TS_PREFIX}
TC_NAME=${TS_NAME:-traffic_cop}
TM_NAME=${TS_NAME:-traffic_manager}
TS_NAME=${TS_NAME:-traffic_server}
-TC_DAEMON=${TC_DAEMON:-$TS_ROOT/bin/traffic_cop}
+TC_DAEMON=${TC_DAEMON:-$TS_ROOT@exec_prefix@/bin/traffic_cop}
TC_DAEMON_ARGS=""
-TM_DAEMON=${TM_DAEMON:-$TS_ROOT/bin/traffic_manager}
+TM_DAEMON=${TM_DAEMON:-$TS_ROOT@exec_prefix@/bin/traffic_manager}
TM_DAEMON_ARGS=""
-TS_DAEMON=${TS_DAEMON:-$TS_ROOT/bin/traffic_server}
+TS_DAEMON=${TS_DAEMON:-$TS_ROOT@exec_prefix@/bin/traffic_server}
TS_DAEMON_ARGS=""
TC_PIDFILE=${TC_PIDFILE:-$TS_ROOT/var/trafficserver/cop.lock}
TM_PIDFILE=${TM_PIDFILE:-$TS_ROOT/var/trafficserver/manager.lock}