You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ge...@apache.org on 2010/03/02 02:09:52 UTC
svn commit: r917831 - in /incubator/trafficserver/traffic/branches/2.0.x: ./
proxy/ proxy/mgmt2/html2/ proxy/mgmt2/html2/agent-installer/
proxy/mgmt2/html2/charting/ proxy/mgmt2/html2/configure/
proxy/mgmt2/html2/configure/helper/ proxy/mgmt2/html2/ima...
Author: georgep
Date: Tue Mar 2 01:09:51 2010
New Revision: 917831
URL: http://svn.apache.org/viewvc?rev=917831&view=rev
Log:
TS-200: Fix uninstall issue with $datadir by using separate targets for exec and data. Also Update INSTALL with more details.
Modified:
incubator/trafficserver/traffic/branches/2.0.x/INSTALL
incubator/trafficserver/traffic/branches/2.0.x/proxy/Makefile.am
incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/Makefile.am
incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/agent-installer/Makefile.am
incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/charting/Makefile.am
incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/Makefile.am
incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/helper/Makefile.am
incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/images/Makefile.am
incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/include/Makefile.am
incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/monitor/Makefile.am
incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/mrtg/Makefile.am
incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/tune/Makefile.am
Modified: incubator/trafficserver/traffic/branches/2.0.x/INSTALL
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/INSTALL?rev=917831&r1=917830&r2=917831&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/INSTALL (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/INSTALL Tue Mar 2 01:09:51 2010
@@ -7,11 +7,21 @@
http://incubator.apache.org/trafficserver/docs/admin/
-
+ Configure & Build:
+ On Linux:
$ ./configure [--prefix=PREFIX]
$ make
+
+ Next set the cluster interface in 'records.config'
+ On Linux: e.g
+ CONFIG proxy.config.cluster.ethernet_interface STRING eth0
+
+ To install:
$ make install
- $ PREFIX/bin/trafficserver start
+
+ To start Traffic Server process stack (TC, TM, TS):
+ On Linux:
+ $ sudo PREFIX/bin/trafficserver start
The default PREFIX is /usr/local, unless explicitly specified.
Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/Makefile.am?rev=917831&r1=917830&r2=917831&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/Makefile.am Tue Mar 2 01:09:51 2010
@@ -394,19 +394,24 @@
test_xml_parser_SOURCES = test_xml_parser.cc InkXml.cc DiagsConfig.cc
-versiondir = $(pkglocalstatedir)
+versiondir = $(DESTDIR)$(pkglocalstatedir)
dist_version_DATA = TS_version
-install-exec-local:
+install-data-local:
$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgsysconfdir)/internal
- $(INSTALL) -d $(DESTDIR)$(pkglibexecdir)
-uninstall-local:
- -rm -rf $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkglibexecdir)
+install-data-hook:
+ chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgdatadir)
+ -echo $(DESTDIR)$(prefix) > $(DESTDIR)$(prefix)/etc/traffic_server
+
+install-exec-local:
+ $(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkglibexecdir)
install-exec-hook:
- chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkglibexecdir) $(DESTDIR)$(pkgdatadir)
- -echo $(DESTDIR)$(prefix) > $(DESTDIR)$(prefix)/etc/traffic_server
+ chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkglibexecdir)
uninstall-hook:
+ -rm -rf $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkglibexecdir)
-rm -f $(DESTDIR)$(prefix)/etc/traffic_server
+
+
Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/Makefile.am?rev=917831&r1=917830&r2=917831&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/Makefile.am Tue Mar 2 01:09:51 2010
@@ -19,7 +19,7 @@
SUBDIRS = agent-installer charting configure images include monitor mrtg tune
-install-exec-local:
+install-data-local:
$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkgdatadir) \
$(DESTDIR)$(pkgdatadir)/agent-installer \
$(DESTDIR)$(pkgdatadir)/charting \
@@ -31,10 +31,10 @@
$(DESTDIR)$(pkgdatadir)/mrtg \
$(DESTDIR)$(pkgdatadir)/tune
-uninstall-local:
+uninstall-hook:
-rm -rf $(DESTDIR)$(pkgdatadir)
-webuidir = $(pkgdatadir)
+webuidir = $(DESTDIR)$(pkgdatadir)
dist_webui_DATA = \
checkCookies.ink \
enableCookies.ink \
Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/agent-installer/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/agent-installer/Makefile.am?rev=917831&r1=917830&r2=917831&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/agent-installer/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/agent-installer/Makefile.am Tue Mar 2 01:09:51 2010
@@ -15,7 +15,7 @@
# limitations under the License.
-webuidir = $(pkgdatadir)/agent-installer
+webuidir = $(DESTDIR)$(pkgdatadir)/agent-installer
dist_webui_DATA = \
ftp.exp \
ftp.pl \
Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/charting/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/charting/Makefile.am?rev=917831&r1=917830&r2=917831&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/charting/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/charting/Makefile.am Tue Mar 2 01:09:51 2010
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(pkgdatadir)/charting
+webuidir = $(DESTDIR)$(pkgdatadir)/charting
dist_webui_DATA = \
Bandwidth_Savings.html \
Cache_Percent_Free.html \
Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/Makefile.am?rev=917831&r1=917830&r2=917831&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/Makefile.am Tue Mar 2 01:09:51 2010
@@ -16,7 +16,7 @@
SUBDIRS = helper
-webuidir = $(pkgdatadir)/configure
+webuidir = $(DESTDIR)$(pkgdatadir)/configure
dist_webui_DATA = \
c_autoconf_pac.ink \
c_autoconf_wpad.ink \
Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/helper/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/helper/Makefile.am?rev=917831&r1=917830&r2=917831&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/helper/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/configure/helper/Makefile.am Tue Mar 2 01:09:51 2010
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(pkgdatadir)/configure/helper
+webuidir = $(DESTDIR)$(pkgdatadir)/configure/helper
dist_webui_DATA = \
INKMgmtAPICheckTcl.sh \
INKMgmtAPIFtp.tcl \
Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/images/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/images/Makefile.am?rev=917831&r1=917830&r2=917831&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/images/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/images/Makefile.am Tue Mar 2 01:09:51 2010
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(pkgdatadir)/images
+webuidir = $(DESTDIR)$(pkgdatadir)/images
dist_webui_DATA = \
arrow_add.gif \
arrow_cross.gif \
Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/include/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/include/Makefile.am?rev=917831&r1=917830&r2=917831&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/include/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/include/Makefile.am Tue Mar 2 01:09:51 2010
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(pkgdatadir)/include
+webuidir = $(DESTDIR)$(pkgdatadir)/include
dist_webui_DATA = \
body_footer.ink \
body_header.ink \
Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/monitor/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/monitor/Makefile.am?rev=917831&r1=917830&r2=917831&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/monitor/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/monitor/Makefile.am Tue Mar 2 01:09:51 2010
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(pkgdatadir)/monitor
+webuidir = $(DESTDIR)$(pkgdatadir)/monitor
dist_webui_DATA = \
m_alarm.ink \
m_blue_bar.ink \
Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/mrtg/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/mrtg/Makefile.am?rev=917831&r1=917830&r2=917831&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/mrtg/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/mrtg/Makefile.am Tue Mar 2 01:09:51 2010
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(pkgdatadir)/mrtg
+webuidir = $(DESTDIR)$(pkgdatadir)/mrtg
dist_webui_DATA = \
detailed.ink \
overview.ink
\ No newline at end of file
Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/tune/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/tune/Makefile.am?rev=917831&r1=917830&r2=917831&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/tune/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/html2/tune/Makefile.am Tue Mar 2 01:09:51 2010
@@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webuidir = $(pkgdatadir)/tune
+webuidir = $(DESTDIR)$(pkgdatadir)/tune
dist_webui_DATA = \
navigation_tree.xmlcpp