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

[wbonnet]

Revision: 3450
          http://gar.svn.sourceforge.net/gar/?rev=3450&view=rev
Author:   wbonnet
Date:     2009-02-23 21:50:08 +0000 (Mon, 23 Feb 2009)

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

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

Modified: csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile       2009-02-23 21:23:06 UTC 
(rev 3449)
+++ csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile       2009-02-23 21:50:08 UTC 
(rev 3450)
@@ -24,12 +24,10 @@
 SPKG_DESC_CSWajcbeanutilsdoc = $(DESCRIPTION) documentation package
 
 # Defines dependencies
-REQUIRED_PKGS_CSWajcbeanutils  = CSWajcdigester
-REQUIRED_PKGS_CSWajcbeanutils += CSWajclogging
+REQUIRED_PKGS_CSWajcbeanutils  = CSWajcdigester CSWajclogging
 
 # Defines package content
-PKGFILES_CSWajcbeanutilsdoc   = $(prefix)/share/doc/.*
-PKGFILES_CSWajcbeanutilsdoc  += 
$(prefix)/share/licenses/$(GARNAME)-doc/Apache_License_2.0.txt
+PKGFILES_CSWajcbeanutilsdoc   = $(prefix)/share/doc/$(GARNAME)-doc.*
 
 # Defines custom steps since java libs do not use autotools
 WORKSRC = $(WORKDIR)
@@ -49,9 +47,8 @@
           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)
-       @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt 
$(DESTDIR)$(datadir)/licenses/$(GARNAME)/Apache_License_2.0.txt
-       @ginstall -d $(DESTDIR)$(datadir)/licenses/$(GARNAME)-doc
-       @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)
+       @ginstall -d $(DESTDIR)$(datadir)/doc/$(GARNAME)-doc
+       @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt 
$(DESTDIR)$(datadir)/doc/$(GARNAME)
+       @gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt 
$(DESTDIR)$(datadir)/doc/$(GARNAME)-doc
+       @gcp -frp $(WORKSRC)/$(DISTNAME)/apidocs/* 
$(DESTDIR)$(datadir)/doc/$(GARNAME)-doc
        @$(MAKECOOKIE)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel