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

[guengel at users.sourceforge.net]

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

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

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile	2013-04-05 11:27:23 UTC (rev 20590)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile	2013-04-05 20:08:32 UTC (rev 20591)
@@ -444,8 +444,11 @@
 	$(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)))) \
 	)\
 )
 
@@ -583,7 +586,7 @@
 		fi ; \
 	done
 	@echo " ===> Checking for extra libraries in SO_NAMES_*"
-	for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \
+	@for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \
 		if [ -f $(PKGROOT)$(subst 64,$(ISA),$(libdir))/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\
 			: ; \
 		else \

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