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

[dmichelsen at users.sourceforge.net]

Revision: 2537
          http://gar.svn.sourceforge.net/gar/?rev=2537&view=rev
Author:   dmichelsen
Date:     2008-12-11 14:38:59 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
mGAR v2: Make all package variables overwritable per package

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

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2008-12-11 14:38:29 UTC (rev 2536)
+++ csw/mgar/gar/v2/gar.pkg.mk	2008-12-11 14:38:59 UTC (rev 2537)
@@ -82,8 +82,9 @@
 PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER TIMESTAMP
 PKG_EXPORTS += DEPMAKER_EXTRA_ARGS PKGLIB DESTDIR
 
-PKG_ENV  = $(BUILD_ENV)
-PKG_ENV += $(foreach EXP,$(PKG_EXPORTS),$(EXP)="$($(EXP))")
+define _PKG_ENV
+$(BUILD_ENV) $(foreach EXP,$(PKG_EXPORTS),$(EXP)="$(if $($(EXP)_$1),$($(EXP)_$1),$($(EXP)))")
+endef
 
 # Canned command for generating admin file names
 # Usage: $(call admfiles,SUNWpackage,depend copyright)
@@ -217,7 +218,7 @@
 
 package-%: $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend
 	@echo " ==> Processing $*.gspec"
-	@( $(PKG_ENV) mkpackage --spec $(WORKDIR)/$*.gspec \
+	@( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \
 						 --spooldir $(SPKG_SPOOLDIR) \
 						 --destdir  $(SPKG_EXPORT) \
 						 --workdir  $(SPKG_WORKDIR) \
@@ -237,7 +238,7 @@
 
 pkgcheck-%:
 	@echo " ==> Checking compliance: $*"
-	@( checkpkg $(SPKG_EXPORT)/`$(PKG_ENV) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2
+	@( checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2
 
 pkgcheck-p:
 	@$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;)
@@ -269,7 +270,7 @@
 # pkgenv - dump the packaging environment
 #
 pkgenv:
-	@$(PKG_ENV) env
+	@$(foreach SPEC,$(_PKG_SPECS),echo "$(SPEC)";echo;$(call _PKG_ENV,$(SPEC)) env;)
 
 
 # pkglist - list the packages to be built with GAR pathname, catalog name and package name


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