Revision: 15806 http://gar.svn.sourceforge.net/gar/?rev=15806&view=rev Author: wahwah Date: 2011-09-30 09:11:59 +0000 (Fri, 30 Sep 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.0.x: fixed alternatives
Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-09-30 08:58:33 UTC (rev 15805) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-09-30 09:11:59 UTC (rev 15806) @@ -182,11 +182,6 @@ TEST_SCRIPTS = custom TEST_TARGETS = check -ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION) -ALTERNATIVE_mysql$(BASE_VERSION) = $(global_bindir)/$(firstword $(CSW$(NAME)client_programs)) mysql $(bindir)/$(firstword $(CSW$(NAME)client_programs)) 50 -ALTERNATIVE_mysql$(BASE_VERSION) += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ - $(global_bindir)/$C $C $(bindir)/$C) - USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup PROTOTYPE_MODIFIERS = dbdir @@ -253,16 +248,19 @@ EXECUTABLES += resolve_stack_dump EXECUTABLES += resolveip -ALTERNATIVES = $(EXECUTABLES) +ALTERNATIVES = +ALTERNATIVES_CSW$(NAME) = # This list could be generated automatically from $(EXECUTABLES) +# /home/maciej/src/opencsw/.buildsys/v2/gar//gar.pkg.mk:833: *** The variable 'ALTERNATIVE_comp_err' is empty, but must contain an alternative. Stop. +ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION) +ALTERNATIVE_mysql$(BASE_VERSION) = $(global_bindir)/$(firstword $(CSW$(NAME)client_programs)) mysql $(bindir)/$(firstword $(CSW$(NAME)client_programs)) 50 +ALTERNATIVE_mysql$(BASE_VERSION) += $(foreach C,$(wordlist 2,$(words $(CSW$(NAME)client_programs)),$(CSW$(NAME)client_programs)),\ + $(global_bindir)/$C $C $(bindir)/$C) - # Collisions: # /opt/csw/share/mysql/doc/README.CSW -ALTERNATIVES_CSW$(NAME) = - include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel