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

[wbonnet at users.sourceforge.net]

Revision: 13385
          http://gar.svn.sourceforge.net/gar/?rev=13385&view=rev
Author:   wbonnet
Date:     2011-02-19 02:47:59 +0000 (Sat, 19 Feb 2011)

Log Message:
-----------
java/primitives fix Makefile

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

Modified: csw/mgar/pkg/java/ajcprimitives/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajcprimitives/trunk/Makefile	2011-02-19 02:38:40 UTC (rev 13384)
+++ csw/mgar/pkg/java/ajcprimitives/trunk/Makefile	2011-02-19 02:47:59 UTC (rev 13385)
@@ -11,15 +11,24 @@
 
 # Use jakarta sources
 MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 # Set archive filename
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
 # Defines two packages, lib and doc
-DISTFILES += $(call admfiles,CSWajcprimitives,)
-DISTFILES += $(call admfiles,CSWajcprimitivesdoc,)
+PACKAGES = CSWajcprimitives CSWajcprimitivesdoc
 
+# Package architecture is ALL (pure java)
+ARCHALL = 1
+
+CATALOGNAME_CSWajcprimitives = commons_primitives
+CATALOGNAME_CSWajcprimitivesdoc = commons_primit_doc
+
+LICENSE = LICENSE.txt
+
+CHECKPKG_OVERRIDES_CSWajcprimitives += catalogname-does-not-match-pkgname|pkgname=CSWajcprimitives|catalogname=commons_primitives|expected-catalogname=ajcprimitives
+CHECKPKG_OVERRIDES_CSWajcprimitivesdoc += catalogname-does-not-match-pkgname|pkgname=CSWajcprimitivesdoc|catalogname=commons_primit_doc|expected-catalogname=ajcprimitivesdoc
+
 # Defines package description
 SPKG_DESC_CSWajcprimitives    = $(DESCRIPTION)
 SPKG_DESC_CSWajcprimitivesdoc = $(DESCRIPTION) documentation package
@@ -28,7 +37,6 @@
 RUNTIME_DEP_PKGS_CSWajcprimitives  = CSWajclogging CSWajccollect CSWajcbeanutils
 
 # Defines package content
-PKGFILES_CSWajcprimitives  = $(prefix)/share/doc/$(NAME)/LICENSE.txt
 PKGFILES_CSWajcprimitives += $(prefix)/share/java/.*
 
 # Defines custom steps since java libs do not use autotools
@@ -48,7 +56,5 @@
 	   ln -s $(NAME)-$(VERSION).jar $(NAME)-1.jar ; \
 	   ln -s $(NAME)-$(VERSION).jar $(NAME).jar )
 	@ginstall -d $(DESTDIR)$(datadir)/doc/$(NAME)
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(NAME)/License.txt
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/LICENSE.txt $(DESTDIR)$(datadir)/doc/$(NAME)/License-documentation.txt
 	@gcp -frp $(WORKSRC)/$(DISTNAME)/docs/* $(DESTDIR)$(datadir)/doc/$(NAME)
 	@$(MAKECOOKIE)


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