[csw-devel] SF.net SVN: gar:[6677] csw/mgar/gar/v2-pbuild

[dmichelsen at users.sourceforge.net]

Revision: 6677
          http://gar.svn.sourceforge.net/gar/?rev=6677&view=rev
Author:   dmichelsen
Date:     2009-10-02 21:47:51 +0000 (Fri, 02 Oct 2009)

Log Message:
-----------
mGAR v2-pbuild: Use specific SSH instead of the first one in the path

Modified Paths:
--------------
    csw/mgar/gar/v2-pbuild/gar.conf.mk
    csw/mgar/gar/v2-pbuild/gar.mk
    csw/mgar/gar/v2-pbuild/gar.pkg.mk

Modified: csw/mgar/gar/v2-pbuild/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.conf.mk	2009-10-02 21:42:03 UTC (rev 6676)
+++ csw/mgar/gar/v2-pbuild/gar.conf.mk	2009-10-02 21:47:51 UTC (rev 6677)
@@ -52,6 +52,7 @@
 PARALLELMODULATIONS ?= 
 MULTITAIL ?= /opt/csw/bin/multitail
 TTY ?= /usr/bin/tty
+SSH ?= /usr/bin/ssh
 
 # Outbound proxies
 http_proxy ?= 

Modified: csw/mgar/gar/v2-pbuild/gar.mk
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.mk	2009-10-02 21:42:03 UTC (rev 6676)
+++ csw/mgar/gar/v2-pbuild/gar.mk	2009-10-02 21:47:51 UTC (rev 6677)
@@ -165,7 +165,7 @@
 	echo THISHOST="$$(THISHOST)"
 	echo "Building modulation on host '$$(BUILDHOST)'"
 	$$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\
-		ssh $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\
+		$(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\
 		gmake $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\
 	)
 	@# The next line has intentionally been left blank to explicitly terminate this make rule

Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.pkg.mk	2009-10-02 21:42:03 UTC (rev 6676)
+++ csw/mgar/gar/v2-pbuild/gar.pkg.mk	2009-10-02 21:47:51 UTC (rev 6677)
@@ -607,7 +607,7 @@
 		$(if $(PACKAGING_HOST_$P),\
 			$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\
 				$(MAKE) PLATFORM=$P package;,\
-				ssh $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package";\
+				$(SSH) $(PACKAGING_HOST_$P) "$(MAKE) -C $(CURDIR) PLATFORM=$P package";\
 			),\
 			$(error *** No host has been defined for platform $P)\
 		)\


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