X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2fbc54b5103d56fd1704271eb74711c53f07d35e..41dc6d45db484daa8165b921bb9036aa4333341a:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fd4956e6de..b7d16fe620 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST=$(SG_EXTRA_DIST)
 
 DISTCLEANFILES= stamp.configure stamp.build stamp.check *~  
 
-ACLOCAL = aclocal-1.9 -I acmacro
+ACLOCAL = aclocal -I acmacro
 AUTOMAKE_OPTIONS = gnu
 
 check-local:
@@ -53,22 +53,12 @@ if MAINTAINER_MODE
 release: distcheck remote debian publish
 
 debian: dist
-	make -C ~/CVSIMPORT/pkg-grid/gras maintainerclean
+	$(MAKE) -C ~/CVSIMPORT/pkg-grid/gras maintainerclean
 	cp @PACKAGE@-@VERSION@.tar.gz ~/CVSIMPORT/pkg-grid/gras/
 	cp @PACKAGE@-@VERSION@.tar.gz ~/CVSIMPORT/pkg-grid/gras/@PACKAGE@_@VERSION@.orig.tar.gz
-	make -C ~/CVSIMPORT/pkg-grid/gras deb check
+	$(MAKE) -C ~/CVSIMPORT/pkg-grid/gras deb check
 	dput local *.changes
 
-publish-old: dist
-	 @echo "----[ Put the documentation on the local filesystem ]----"
-	 rm -rf ~/public_html/gras/doc
-	 mkdir ~/public_html/gras/doc
-	 cp -r doc/html ~/public_html/gras/doc
-	 @echo "----[ Put the tarball @VERSION@ on the local filesystem ]----"
-	 cp @PACKAGE@-@VERSION@.tar.gz ~/public_html/gras/dl
-	 @echo "----[ Sync remote host ]----"
-	 make -C public_html publish
-
 publish: dist
 	 @echo "----[ Put the tarball @VERSION@ on gforge ]----"
 #	 scp @PACKAGE@-@VERSION@.tar.gz gcl.ucsd.edu:/home/www/simgrid/dl/
@@ -79,7 +69,7 @@ publish: dist
 	 cp @PACKAGE@-@VERSION@.tar.gz ~/public_html/simgrid2
 	 cp -r doc/html ~/public_html/simgrid2/doc/
 	 cp ChangeLog ~/public_html/simgrid2/
-	 make -C ~/public_html
+	 $(MAKE) -C ~/public_html
 
 sync-gforge: 
 	rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times \
@@ -89,6 +79,7 @@ sync-gforge:
 	scp doc/webcruft/simgrid_modules2.png doc/webcruft/simgrid_modules.png doc/webcruft/simgrid_logo.png doc/webcruft/simgrid_logo_small.png scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/
 	ssh scm.gforge.inria.fr "chgrp -R simgrid /var/lib/gforge/chroot/home/groups/simgrid/htdocs/"
 	ssh scm.gforge.inria.fr "chmod g+rw -R /var/lib/gforge/chroot/home/groups/simgrid/htdocs/* || true"
+	ssh scm.gforge.inria.fr "chmod a+rX -R /var/lib/gforge/chroot/home/groups/simgrid/htdocs/* || true"
 
 mail:
 	 @ver=`dpkg-parsechangelog -lChangeLog | egrep '^Version: ' | sed 's/Version: //'`;\
@@ -107,10 +98,10 @@ mail:
 	       simgrid-user@lists.gforge.inria.fr
 
 TAGS:
-	etags -o ./TAGS `make dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` 
+	etags -o ./TAGS `$(MAKE) dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` 
 
 splint:
-	splint `make dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` \
+	splint `$(MAKE) dist-files | grep -v $(PWD) | egrep '\.[ch]$$' |sort -u` \
 	       +matchanyintegral -warnposix +boolint \
 	       +show-summary +stats\
 	       -Iinclude -Isrc/include -Isrc/base -Isrc