[csw-devel] SF.net SVN: gar:[2853] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 2853
          http://gar.svn.sourceforge.net/gar/?rev=2853&view=rev
Author:   dmichelsen
Date:     2009-01-18 19:58:32 +0000 (Sun, 18 Jan 2009)

Log Message:
-----------
mGAR v2: Skip perllocal.pod and .packlist by default for category 'cpan'

Modified Paths:
--------------
    csw/mgar/gar/v2/categories/cpan/category.mk
    csw/mgar/gar/v2/gar.mk

Modified: csw/mgar/gar/v2/categories/cpan/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/cpan/category.mk	2009-01-18 17:17:42 UTC (rev 2852)
+++ csw/mgar/gar/v2/categories/cpan/category.mk	2009-01-18 19:58:32 UTC (rev 2853)
@@ -33,6 +33,8 @@
 
 SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME)
 
+_MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist
+
 include gar/gar.mk
 
 # Canned commands for finding packlist files

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2009-01-18 17:17:42 UTC (rev 2852)
+++ csw/mgar/gar/v2/gar.mk	2009-01-18 19:58:32 UTC (rev 2853)
@@ -519,11 +519,14 @@
 endif
 _MERGE_INCLUDE_FILES += $(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION))
 
+# This can be defined in category.mk
+MERGE_EXCLUDE_CATEGORY ?= $(_MERGE_EXCLUDE_CATEGORY)
+
 MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir
 MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/.*\.la
 MERGE_EXCLUDE_BACKUPFILES ?= .*\~
 MERGE_EXCLUDE_STATICLIBS ?= $(libdir)/.*\.a
-MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS)
+MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS)
 
 # Exclude these files
 ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined)


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