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

[dmichelsen at users.sourceforge.net]

Revision: 9632
          http://gar.svn.sourceforge.net/gar/?rev=9632&view=rev
Author:   dmichelsen
Date:     2010-04-14 09:24:14 +0000 (Wed, 14 Apr 2010)

Log Message:
-----------
mGAR v2: Allow ALTERNATIVES for simple case

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-04-13 10:27:08 UTC (rev 9631)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-04-14 09:24:14 UTC (rev 9632)
@@ -693,14 +693,15 @@
 merge-alternatives-%:
 	@echo "[ Generating alternatives for package $* ]"
 	$(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/alternatives
-	$(_DBG)($(foreach A,$(or $(ALTERNATIVES_$*),$(ALTERNATIVES)), \
+	$(_DBG)($(if $(ALTERNATIVE),echo "$(ALTERNATIVE)";) \
+		$(foreach A,$(or $(ALTERNATIVES_$*),$(ALTERNATIVES)), \
 		$(if $(ALTERNATIVE_$A), \
 			echo "$(ALTERNATIVE_$A)";, \
 			$(error The variable 'ALTERNATIVE_$A' is empty, but must contain an alternative) \
 		))) > $(PKGROOT)/opt/csw/share/alternatives/$(call catalogname,$*)
 	@$(MAKECOOKIE)
 
-merge-alternatives: $(foreach S,$(SPKG_SPECS),$(if $(or $(ALTERNATIVES_$S),$(ALTERNATIVES)),merge-alternatives-$S))
+merge-alternatives: $(foreach S,$(SPKG_SPECS),$(if $(or $(ALTERNATIVES_$S),$(ALTERNATIVES),$(ALTERNATIVE)),merge-alternatives-$S))
 
 reset-merge-alternatives:
 	@rm -f $(COOKIEDIR)/merge-alternatives $(foreach SPEC,$(_PKG_SPECS),$(COOKIEDIR)/merge-alternatives-$(SPEC))


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