You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2011/07/15 21:47:14 UTC
svn commit: r1147297 - in /trafficserver/traffic/branches/3.0.x: ./ CHANGES Makefile.am STATUS example/app-template/Makefile.am proxy/Makefile.am

Author: igalic
Date: Fri Jul 15 19:47:13 2011
New Revision: 1147297

URL: http://svn.apache.org/viewvc?rev=1147297&view=rev
Log:
backport TS-842

Modified:
    trafficserver/traffic/branches/3.0.x/   (props changed)
    trafficserver/traffic/branches/3.0.x/CHANGES
    trafficserver/traffic/branches/3.0.x/Makefile.am
    trafficserver/traffic/branches/3.0.x/STATUS
    trafficserver/traffic/branches/3.0.x/example/app-template/Makefile.am
    trafficserver/traffic/branches/3.0.x/proxy/Makefile.am

Propchange: trafficserver/traffic/branches/3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 15 19:47:13 2011
@@ -1,4 +1,4 @@
 /incubator/trafficserver/traffic/branches/dev:891823-915885
 /trafficserver/traffic/branches/ts-291:965529-991993
 /trafficserver/traffic/branches/wccp:1021790-1040544
-/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414
+/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1136958,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414

Modified: trafficserver/traffic/branches/3.0.x/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/CHANGES?rev=1147297&r1=1147296&r2=1147297&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/3.0.x/CHANGES Fri Jul 15 19:47:13 2011
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
 Changes with Apache Traffic Server 3.0.1
+  *) [TS-842] remove uninstall target from build system
+
   *) [TS-868] build fails with --as-needed. Author: Ilya Barygin.
 
   *) [TS-860] Built in error for host not found looks like Internet Explorer

Modified: trafficserver/traffic/branches/3.0.x/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/Makefile.am?rev=1147297&r1=1147296&r2=1147297&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/Makefile.am (original)
+++ trafficserver/traffic/branches/3.0.x/Makefile.am Fri Jul 15 19:47:13 2011
@@ -79,6 +79,5 @@ help:
    echo 'help             display this list of make targets' && \
    echo 'install          install by copying the built files to system-wide dirs' && \
    echo 'install-strip    same as install but then strips debugging symbols' && \
-   echo 'install-examples install examples by copying the built files to system-wide dirs' && \
-   echo 'uninstall        opposite of install, removes installed files'
+   echo 'install-examples install examples by copying the built files to system-wide dirs'
 

Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1147297&r1=1147296&r2=1147297&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Fri Jul 15 19:47:13 2011
@@ -39,10 +39,7 @@ A list of all bugs open for the next v3.
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
-  * build: remove uninstall target from build system
-    Trunk patch: http://svn.apache.org/viewvc?rev=1136958&view=rev
-    Jira: https://issues.apache.org/jira/browse/TS-842
-    +1: igalic, zwoop, amc
+
 
 RELEASE PROCESS
 

Modified: trafficserver/traffic/branches/3.0.x/example/app-template/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/example/app-template/Makefile.am?rev=1147297&r1=1147296&r2=1147297&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/example/app-template/Makefile.am (original)
+++ trafficserver/traffic/branches/3.0.x/example/app-template/Makefile.am Fri Jul 15 19:47:13 2011
@@ -61,5 +61,3 @@ install-exec-local:
 install-exec-hook:
 	-chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkglibexecdir)
 
-uninstall-hook:
-	-rm -rf $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkglibexecdir)

Modified: trafficserver/traffic/branches/3.0.x/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/proxy/Makefile.am?rev=1147297&r1=1147296&r2=1147297&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/proxy/Makefile.am (original)
+++ trafficserver/traffic/branches/3.0.x/proxy/Makefile.am Fri Jul 15 19:47:13 2011
@@ -297,7 +297,3 @@ install-exec-local:
 install-exec-hook:
 	-chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkglibexecdir)
 
-uninstall-hook:
-	-rm -rf $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgruntimedir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkglibexecdir) $(DESTDIR)$(pkgcachedir)
-
-