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/05/06 22:44:56 UTC
svn commit: r941910 - in /trafficserver/traffic/trunk/proxy: ./ mgmt2/html2/
mgmt2/html2/agent-installer/ mgmt2/html2/charting/ mgmt2/html2/configure/
mgmt2/html2/configure/helper/ mgmt2/html2/images/ mgmt2/html2/include/
mgmt2/html2/monitor/ mgmt2/htm...
Author: zwoop
Date: Thu May 6 20:44:55 2010
New Revision: 941910
URL: http://svn.apache.org/viewvc?rev=941910&view=rev
Log:
TS-336: TS-336: Properly "make install DESTDIR=" to work.
Reviewed: Georgep & Mike McGrath.
Modified:
trafficserver/traffic/trunk/proxy/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/html2/charting/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/html2/images/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/html2/include/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/Makefile.am
Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=941910&r1=941909&r2=941910&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Thu May 6 20:44:55 2010
@@ -385,7 +385,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/trunk/proxy/mgmt2/html2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am?rev=941910&r1=941909&r2=941910&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am Thu May 6 20:44:55 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/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am?rev=941910&r1=941909&r2=941910&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am Thu May 6 20:44:55 2010
@@ -15,7 +15,7 @@
# limitations under the License.
-webuidir = $(DESTDIR)$(pkgdatadir)/agent-installer
+webuidir = $(pkgdatadir)/agent-installer
dist_webui_DATA = \
installer.cgi \
installer.html
Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/charting/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/charting/Makefile.am?rev=941910&r1=941909&r2=941910&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/charting/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/charting/Makefile.am Thu May 6 20:44:55 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/trunk/proxy/mgmt2/html2/configure/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am?rev=941910&r1=941909&r2=941910&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am Thu May 6 20:44:55 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/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am?rev=941910&r1=941909&r2=941910&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am Thu May 6 20:44:55 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 \
log.sh \
Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/images/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/images/Makefile.am?rev=941910&r1=941909&r2=941910&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/images/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/images/Makefile.am Thu May 6 20:44:55 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/trunk/proxy/mgmt2/html2/include/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/include/Makefile.am?rev=941910&r1=941909&r2=941910&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/include/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/include/Makefile.am Thu May 6 20:44:55 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/trunk/proxy/mgmt2/html2/monitor/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am?rev=941910&r1=941909&r2=941910&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am Thu May 6 20:44:55 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/trunk/proxy/mgmt2/html2/mrtg/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/Makefile.am?rev=941910&r1=941909&r2=941910&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/Makefile.am Thu May 6 20:44:55 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/trunk/proxy/mgmt2/html2/tune/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/Makefile.am?rev=941910&r1=941909&r2=941910&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/Makefile.am Thu May 6 20:44:55 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