[csw-devel] SF.net SVN: gar:[3149] csw/mgar/gar/v2/gar.pkg.mk

[dmichelsen at users.sourceforge.net]

Revision: 3149
          http://gar.svn.sourceforge.net/gar/?rev=3149&view=rev
Author:   dmichelsen
Date:     2009-02-17 18:19:08 +0000 (Tue, 17 Feb 2009)

Log Message:
-----------
mGAR v2: Don't add the dyngspec default package when gspec is explicitly specified

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.pkg.mk

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2009-02-17 15:51:02 UTC (rev 3148)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-02-17 18:19:08 UTC (rev 3149)
@@ -23,9 +23,13 @@
 
 # You can use either PACKAGES with dynamic gspec-files or explicitly add gspec-files to DISTFILES.
 # Do "PACKAGES = CSWmypkg" when you build a package whose GARNAME is not the package name.
+# If no explicit gspec-files have been defined the default name for the package is CSW$(GARNAME).
 # The whole processing is done from _SPKG_SPECS, which includes all packages to be build.
-PACKAGES ?= CSW$(GARNAME)
+ifeq ($(origin PACKAGES), undefined)
+SPKG_SPECS     ?= $(if $(filter %.gspec,$(DISTFILES)),$(basename $(filter %.gspec,$(DISTFILES))),CSW$(GARNAME))
+else
 SPKG_SPECS     ?= $(sort $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES))
+endif
 _PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
 
 # pkgname - Get the name of a package from a gspec-name or package-name


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