Revision: 8361
http://gar.svn.sourceforge.net/gar/?rev=8361&view=rev
Author: dmichelsen
Date: 2010-02-05 15:20:09 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
mGAR v2: Fix bug which ignores MIGRATE_SOURCE_DIR and MIGRATE_DEST_DIR
Modified Paths:
--------------
csw/mgar/gar/v2/gar.pkg.mk
Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk 2010-02-05 14:50:23 UTC (rev 8360)
+++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-05 15:20:09 UTC (rev 8361)
@@ -608,8 +608,8 @@
@echo "X: $(MIGRATE_FILES_$*) Y: $(MIGRATE_FILES)"
$(_DBG)ginstall -d $(PKGROOT)/etc/opt/csw/pkg/$*
$(_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_$*)\"";)\
+ $(if $(or $(MIGRATE_SOURCE_DIR_$*),$(MIGRATE_SOURCE_DIR)),echo
"SOURCE_DIR___default__=\"$(or
$(MIGRATE_SOURCE_DIR_$*),$(MIGRATE_SOURCE_DIR))\"";)\
+ $(if $(or $(MIGRATE_DEST_DIR_$*),$(MIGRATE_DEST_DIR)),echo
"DEST_DIR___default__=\"$(or $(MIGRATE_DEST_DIR_$*),$(MIGRATE_DEST_DIR))\"";)\
$(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.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
