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

[wbonnet at users.sourceforge.net]

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

Log Message:
-----------
java/logging fix makefile

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

Modified: csw/mgar/pkg/java/ajclogging/trunk/Makefile
===================================================================
--- csw/mgar/pkg/java/ajclogging/trunk/Makefile	2011-02-19 01:56:01 UTC (rev 13380)
+++ csw/mgar/pkg/java/ajclogging/trunk/Makefile	2011-02-19 02:03:13 UTC (rev 13381)
@@ -11,15 +11,24 @@
 
 # Use jakarta sources
 MASTER_SITES = http://apache.cict.fr/commons/$(SHORTNAME)/binaries/
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)(-bin*).tar.gz
 
 # Set archive filename
 DISTFILES = $(NAME)-$(VERSION)-bin.tar.gz
 
 # Defines two packages, lib and doc
-DISTFILES += $(call admfiles,CSWajclogging,)
-DISTFILES += $(call admfiles,CSWajcloggingdoc,)
+PACKAGES = CSWajclogging CSWajcloggingdoc
 
+# Package architecture is ALL (pure java)
+ARCHALL = 1
+
+CATALOGNAME_CSWajclogging = commons_logging
+CATALOGNAME_CSWajcloggingdoc = commons_logging_doc
+
+LICENSE = LICENSE.txt
+
+CHECKPKG_OVERRIDES_CSWajclogging += catalogname-does-not-match-pkgname|pkgname=CSWajclogging|catalogname=commons_logging|expected-catalogname=ajclogging
+CHECKPKG_OVERRIDES_CSWajcloggingdoc += catalogname-does-not-match-pkgname|pkgname=CSWajcloggingdoc|catalogname=commons_logging_doc|expected-catalogname=ajcloggingdoc
+
 # Defines package description
 SPKG_DESC_CSWajclogging    = $(DESCRIPTION)
 SPKG_DESC_CSWajcloggingdoc = $(DESCRIPTION) documentation package
@@ -28,7 +37,6 @@
 RUNTIME_DEP_PKGS_CSWajclogging = CSWlog4j
 
 # Defines package content
-PKGFILES_CSWajclogging  = $(prefix)/share/doc/$(NAME)/License.txt
 PKGFILES_CSWajclogging += $(prefix)/share/java/.*
 
 # Defines custom steps since java libs do not use autotools
@@ -49,7 +57,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)/site/* $(DESTDIR)$(datadir)/doc/$(NAME)
 	@$(MAKECOOKIE)


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