[csw-devel] SF.net SVN: gar:[20669] csw/mgar/pkg/tomcat7/trunk/Makefile

[wilbury at users.sourceforge.net]

Revision: 20669
          http://gar.svn.sourceforge.net/gar/?rev=20669&view=rev
Author:   wilbury
Date:     2013-04-10 22:18:11 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
tomcat7/trunk: Correct the previous commit.

Modified Paths:
--------------
    csw/mgar/pkg/tomcat7/trunk/Makefile

Modified: csw/mgar/pkg/tomcat7/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tomcat7/trunk/Makefile	2013-04-10 22:11:51 UTC (rev 20668)
+++ csw/mgar/pkg/tomcat7/trunk/Makefile	2013-04-10 22:18:11 UTC (rev 20669)
@@ -64,7 +64,7 @@
 	@$(MAKECOOKIE)
 
 post-extract:
-	( mv $(WORKDIR)/tomcat-$(VERSION) $(WORKDIR)/$(DISTNAME) )
+	( mv $(WORKDIR)/apache-tomcat-$(VERSION) $(WORKDIR)/$(DISTNAME) )
 	( for i in temp work logs conf ; do  find $(WORKDIR)/$(DISTNAME)/$$i -type d -exec chmod 0750 {} \;  ; find $(WORKDIR)/$(DISTNAME)/$$i -type f -exec chmod 0640 {} \; ; done )
 	@$(MAKECOOKIE)
 
@@ -75,7 +75,7 @@
 	( mkdir -p $(DESTDIR)/opt/csw/etc/$(NAME) )
 	( mkdir -p $(DESTDIR)/var/opt/csw/$(NAME) )
 	( mkdir -p $(DESTDIR)/opt/csw/share )
-	( cp -fr $(WORKDIR)/tomcat-$(VERSION) $(DESTDIR)/opt/csw/share/$(NAME) )
+	( cp -fr $(WORKDIR)/$(DISTNAME) $(DESTDIR)/opt/csw/share/$(NAME) )
 	( cp -fr $(FILEDIR)/csw$(NAME) $(DESTDIR)/etc/opt/csw/init.d )
 	( mv     $(DESTDIR)/opt/csw/share/$(NAME)/conf $(DESTDIR)/etc/opt/csw/$(NAME)/conf )
 	( mv     $(DESTDIR)/opt/csw/share/$(NAME)/logs $(DESTDIR)/var/opt/csw/$(NAME) )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.