You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/13 09:37:17 UTC

svn commit: r943833 - in /trafficserver/traffic/trunk/proxy: Makefile.am trafficserver-release

Author: mturk
Date: Thu May 13 07:37:17 2010
New Revision: 943833

URL: http://svn.apache.org/viewvc?rev=943833&view=rev
Log:
Generate trafficserver-release from PACKAGE_VERSION instead maintaining two separate version data locations

Removed:
    trafficserver/traffic/trunk/proxy/trafficserver-release
Modified:
    trafficserver/traffic/trunk/proxy/Makefile.am

Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=943833&r1=943832&r2=943833&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Thu May 13 07:37:17 2010
@@ -390,7 +390,6 @@ test_ClusterHashStandalone_LDADD = libCl
 test_xml_parser_SOURCES = test_xml_parser.cc InkXml.cc DiagsConfig.cc
 
 versiondir = $(pkgsysconfdir)
-dist_version_DATA = trafficserver-release
 
 install-data-local:
 	$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkglocalstatedir) $(DESTDIR)$(pkglogdir) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgsysconfdir)/internal $(DESTDIR)$(pkgdatadir)
@@ -398,6 +397,7 @@ install-data-local:
 install-data-hook:
 	-chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkgsysconfdir) $(DESTDIR)$(pkgdatadir)
 	-echo $(DESTDIR)$(prefix) > $(DESTDIR)$(prefix)/etc/traffic_server
+	-echo "<TS_VERSION> $(PACKAGE_VERSION)" > $(DESTDIR)$(prefix)/etc/trafficserver-release
 
 install-exec-local:
 	$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkglibexecdir)