[csw-devel] SF.net SVN: gar:[20592] csw/mgar/pkg/postgresql/branches/postgresql-8.4/ Makefile

[guengel at users.sourceforge.net]

Revision: 20592
          http://gar.svn.sourceforge.net/gar/?rev=20592&view=rev
Author:   guengel
Date:     2013-04-05 20:08:53 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-8.4: Fixed alternatives.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile	2013-04-05 20:08:32 UTC (rev 20591)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile	2013-04-05 20:08:53 UTC (rev 20592)
@@ -444,11 +444,13 @@
 uppercase_client = CLIENT
 uppercase_contrib = CONTRIB
 $(foreach pkg,$(myALTERNATIVES),\
-	$(eval alt_priority = 20) \
 	$(foreach alt,$(NEEDED_ISAS), \
 		$(eval alt_priority=$(shell expr $(alt_priority) + 10)) \
-		$(eval ALTERNATIVE_$(pkg)_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_$(uppercase_$(pkg)))),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) \
-		$(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
+		$(eval firstbin=$(firstword $(BIN_NAMES_$(uppercase_$(pkg))))) \
+		$(eval mybindir=$(prefix)/bin) \
+		$(eval mylibexecdir=$(prefix)/libexec/$(alt)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(mybindir)/$(firstbin)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(mylibexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$(firstbin)) $(alt_priority)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(mybindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(mylibexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
 	)\
 )
 

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