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

[dmichelsen at users.sourceforge.net]

Revision: 7361
          http://gar.svn.sourceforge.net/gar/?rev=7361&view=rev
Author:   dmichelsen
Date:     2009-11-20 15:15:11 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
mGAR v2: Clarify variable assignment in MIGRATE_FILES

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-11-20 09:34:23 UTC (rev 7360)
+++ csw/mgar/gar/v2/gar.pkg.mk	2009-11-20 15:15:11 UTC (rev 7361)
@@ -596,16 +596,14 @@
 merge-migrateconf: $(foreach S,$(SPKG_SPECS),$(if $(or $(MIGRATE_FILES_$S),$(MIGRATE_FILES)),merge-migrateconf-$S))
 	@$(MAKECOOKIE)
 
-merge-migrateconf-%: MIGRATE_FILES_$* ?= $(MIGRATE_FILES)
-merge-migrateconf-%: MIGRATE_SOURCE_DIR_$* ?= $(MIGRATE_SOURCE_DIR)
-merge-migrateconf-%: MIGRATE_DEST_DIR_$* ?= $(MIGRATE_DEST_DIR)
 merge-migrateconf-%:
 	@echo "[ Generating cswmigrateconf for package $* ]"
+	@echo "X: $(MIGRATE_FILES_$*) Y: $(MIGRATE_FILES)"
 	$(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$*
-	$(_DBG)(echo "MIGRATE_FILES=\"$(MIGRATE_FILES_$*)\"";\
+	$(_DBG)(echo "MIGRATE_FILES=\"$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES))\"";\
 		 $(if $(MIGRATE_SOURCE_DIR_$*),echo "SOURCE_DIR___default__=\"$(MIGRATE_SOURCE_DIR_$*)\"";)\
 		 $(if $(MIGRATE_DEST_DIR_$*),echo "DEST_DIR___default__=\"$(MIGRATE_DEST_DIR_$*)\"";)\
-		 $(foreach F,$(MIGRATE_FILES_$*),\
+		 $(foreach F,$(or $(MIGRATE_FILES_$*),$(MIGRATE_FILES)),\
 			$(if $(MIGRATE_SOURCE_DIR_$F),echo "SOURCE_DIR_$(subst .,_,$F)=\"$(MIGRATE_SOURCE_DIR_$F)\"";)\
 			$(if $(MIGRATE_DEST_DIR_$F),echo "DEST_DIR_$(subst .,_,$F)=\"$(MIGRATE_DEST_DIR_$F)\"";)\
 		)\


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