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

[dmichelsen at users.sourceforge.net]

Revision: 8527
          http://gar.svn.sourceforge.net/gar/?rev=8527&view=rev
Author:   dmichelsen
Date:     2010-02-12 15:32:57 +0000 (Fri, 12 Feb 2010)

Log Message:
-----------
mGAR v2: Use include on alternatives only when separating packages

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-12 15:13:02 UTC (rev 8526)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-02-12 15:32:57 UTC (rev 8527)
@@ -392,9 +392,16 @@
 	      -n "$(_PKGFILES_EXCLUDE)" -o \
 	      -n "$(ISAEXEC_FILES_$*)" -o \
 	      -n "$(ISAEXEC_FILES)" ]; then \
-	  (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),-I $(call licensedir,$*)/license -I /etc/opt/csw/pkg/$*/cswmigrateconf) \
-		      $(if $(or $(ALTERNATIVES_$*),$(ALTERNATIVES)),-I /opt/csw/share/alternatives/$(call catalogname,$*)) \
-		      $(foreach S,$(filter-out $*,$(SPKG_SPECS)),-X $(call licensedir,$S)/license -X /etc/opt/csw/pkg/$S/cswmigrateconf -X /opt/csw/share/alternatives/$(call catalogname,$S)) \
+	  (pathfilter $(if $(or $(_PKGFILES_EXCLUDE),$(_PKGFILES_INCLUDE)),\
+				-I $(call licensedir,$*)/license \
+				-I /etc/opt/csw/pkg/$*/cswmigrateconf \
+		      		-I /opt/csw/share/alternatives/$(call catalogname,$*) \
+		      )\
+		      $(foreach S,$(filter-out $*,$(SPKG_SPECS)),\
+				-X $(call licensedir,$S)/license \
+				-X /etc/opt/csw/pkg/$S/cswmigrateconf \
+				-X /opt/csw/share/alternatives/$(call catalogname,$S) \
+		      ) \
 		      $(foreach I,$(EXTRA_PKGFILES_INCLUDED) $(EXTRA_PKGFILES_INCLUDED_$*),-i '$I') \
 		      $(foreach X,$(EXTRA_PKGFILES_EXCLUDED) $(EXTRA_PKGFILES_EXCLUDED_$*),-x '$X') \
 		      $(foreach FILE,$(_PKGFILES_INCLUDE),-i '$(FILE)') \


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