[csw-devel] SF.net SVN: gar:[3470] csw/mgar/pkg/java/ajcchain/trunk/Makefile

[wbonnet at users.sourceforge.net]

Revision: 3470
          http://gar.svn.sourceforge.net/gar/?rev=3470&view=rev
Author:   wbonnet
Date:     2009-02-24 20:50:53 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
Fix license path

Modified Paths:
--------------
    csw/mgar/pkg/java/ajcchain/trunk/Makefile

Modified: csw/mgar/pkg/java/ajcchain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajcchain/trunk/Makefile	2009-02-24 19:48:23 UTC (rev 3469)
+++ csw/mgar/pkg/java/ajcchain/trunk/Makefile	2009-02-24 20:50:53 UTC (rev 3470)
@@ -24,12 +24,11 @@
 SPKG_DESC_CSWajcchaindoc = $(DESCRIPTION) documentation package
 
 # Defines dependencies
-REQUIRED_PKGS_CSWajcchain  = CSWajcdigester
-REQUIRED_PKGS_CSWajcchain += CSWajclogging
+REQUIRED_PKGS_CSWajcchain  = CSWajcdigester CSWajclogging
 
 # Defines package content
-PKGFILES_CSWajcchaindoc   = $(prefix)/share/doc/.*
-PKGFILES_CSWajcchaindoc  += $(prefix)/share/licenses/$(GARNAME)-doc/Apache_License_2.0.txt
+PKGFILES_CSWajcchain   	 = $(prefix)/share/doc/$(GARNAME)/LICENSE.txt
+PKGFILES_CSWajcchain   	+= $(prefix)/share/java/.*
 
 # Defines custom steps since java libs do not use autotools
 WORKSRC = $(WORKDIR)
@@ -48,9 +47,7 @@
 	   ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME)-1.jar ; \
 	   ln -s $(GARNAME)-$(GARVERSION).jar $(GARNAME).jar )
 	@ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME)
-	@ginstall -d $(DESTDIR)$(datadir)/licenses/$(GARNAME)
-	@ginstall -d $(DESTDIR)$(datadir)/licenses/$(GARNAME)-doc
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/licenses/$(GARNAME)/Apache_License_2.0.txt
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/licenses/$(GARNAME)-doc/Apache_License_2.0.txt
-	@gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(GARNAME)/
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(GARNAME)/LICENSE-documentation.txt
+	@gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* $(DESTDIR)$(datadir)/doc/$(GARNAME)
 	@$(MAKECOOKIE)


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