X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fdd8ad6fdd72c8a26648e7d5e8054e63c7d1c277..9ae1c2c20f7730e31bb16472f2a9ae4c83b10b79:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f63ab4fc45..89f0424aec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS= include src examples testsuite doc
 DISTCLEANFILES =  *~  
 
-ACLOCAL = aclocal -I acmacro
+ACLOCAL = aclocal-1.9 -I acmacro
 AUTOMAKE_OPTIONS = gnu
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
@@ -97,11 +97,11 @@ MACHINES ?= valnure.cs.ucsb.edu sperm.cs.ucsb.edu     basalt.cs.ucsb.edu \
 # default value:
 ACTION ?= clean untar config compile check
 
-REMOTE_PREFIX ?='${HOME}/gras'
+REMOTE_PREFIX ?='${HOME}/simgrid'
 
 remote: @PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker
 	@echo;echo "----[ Recompile the package on remote hosts ]----"
-	@test -e buildlogs/@PACKAGE@-@VERSION@ || mkdir -p buildlogs/@PACKAGE@-@VERSION@
+	@test -e @srcdir@/buildlogs/@PACKAGE@-@VERSION@ || mkdir -p @srcdir@/buildlogs/@PACKAGE@-@VERSION@
 	@failed=0;\
 	 for site in $(MACHINES) ; do \
 	   machine=`echo $$site |sed 's/^\([^%]*\)%.*$$/\1/'`;\
@@ -115,19 +115,19 @@ remote: @PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker
 	   fi;\
 	   \
 	   echo "-- Copy the data over"; \
-	   scp @PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker \
+	   scp @srcdir@/@PACKAGE@-@VERSION@.tar.gz tools/compile-remote-worker \
 	       $$machine:$(REMOTE_PREFIX)/src;\
 	   \
-	   echo "-- Compiling... (the output gets into buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; \
+	   echo "-- Compiling... (the output gets into @srcdir@/buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; \
 	   if echo $$site | grep  '%' >/dev/null ; then \
-	     if ssh $$machine "env REMOTE_PREFIX=$(REMOTE_PREFIX) ssh -A $$machine2 $$cmd" 2>&1 > buildlogs/@PACKAGE@-@VERSION@/$$site.log;\
-	     then echo "Sucessful"; else failed=1;echo "Failed (check buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; fi;echo; \
+	     if ssh $$machine "env REMOTE_PREFIX=$(REMOTE_PREFIX) ssh -A $$machine2 $$cmd" 2>&1 > @srcdir@/buildlogs/@PACKAGE@-@VERSION@/$$site.log;\
+	     then echo "Sucessful"; else failed=1;echo "Failed (check @srcdir@/buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; fi;echo; \
 	   else \
-	     if ssh $$machine "eval $$cmd" 2>&1 > buildlogs/@PACKAGE@-@VERSION@/$$site.log ;\
-	     then echo "Sucessful"; else failed=1;echo "Failed (check buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; fi;echo; \
+	     if ssh $$machine "eval $$cmd" 2>&1 > @srcdir@/buildlogs/@PACKAGE@-@VERSION@/$$site.log ;\
+	     then echo "Sucessful"; else failed=1;echo "Failed (check @srcdir@/buildlogs/@PACKAGE@-@VERSION@/$$site.log)"; fi;echo; \
 	   fi;\
 	done;\
-	tools/compile-stats;\
+	@srcdir@/tools/compile-stats;\
 	exit $$failed
 
 endif