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

[wbonnet at users.sourceforge.net]

Revision: 13358
          http://gar.svn.sourceforge.net/gar/?rev=13358&view=rev
Author:   wbonnet
Date:     2011-02-18 11:37:47 +0000 (Fri, 18 Feb 2011)

Log Message:
-----------
Fix Makefile

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

Modified: csw/mgar/pkg/java/ajcconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajcconfig/trunk/Makefile	2011-02-18 11:20:23 UTC (rev 13357)
+++ csw/mgar/pkg/java/ajcconfig/trunk/Makefile	2011-02-18 11:37:47 UTC (rev 13358)
@@ -11,26 +11,34 @@
 
 # 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,CSWajcconfig,)
-DISTFILES += $(call admfiles,CSWajcconfigdoc,)
+PACKAGES = CSWajcconfig CSWajcconfigdoc
 
+# Package architecture is ALL (pure java)
+ARCHALL = 1
+
+CATALOGNAME_CSWajcconfig = commons_config
+CATALOGNAME_CSWajcconfigdoc = commons_config_doc
+
+LICENSE = LICENSE.txt
+
 # Defines package description
 SPKG_DESC_CSWajcconfig    = $(DESCRIPTION)
 SPKG_DESC_CSWajcconfigdoc = $(DESCRIPTION) documentation package
 
 # Defines dependencies
-RUNTIME_DEP_PKGS_CSWajcconfig  = CSWajclogging CSWajclang CSWajcdigester CSWajccollect CSWajcbeanutils 	
+RUNTIME_DEP_PKGS_CSWajcconfig  = CSWajclogging CSWajclang CSWajcdigester CSWajccollect 
 
 # Defines package content
-PKGFILES_CSWajcconfig 	 = $(prefix)/share/doc/$(NAME)/License.txt
 PKGFILES_CSWajcconfig  	+= $(prefix)/share/java/.*
 
+CHECKPKG_OVERRIDES_CSWajcconfig += catalogname-does-not-match-pkgname|pkgname=CSWajcconfig|catalogname=commons_config|expected-catalogname=ajcconfig
+CHECKPKG_OVERRIDES_CSWajcconfigdoc += catalogname-does-not-match-pkgname|pkgname=CSWajcconfigdoc|catalogname=commons_config_doc|expected-catalogname=ajcconfigdoc
+
 # Defines custom steps since java libs do not use autotools
 WORKSRC = $(WORKDIR)
 
@@ -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.