X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=ef55346c7435b768f42402466410430a0d60c376;hb=e450a7ff804c812404d99c7a955eb1e34f426218;hp=e0380820ac5b08c8e871dc2503b6b7e047abee13;hpb=761037d4f571a71de9297567a0bcdab7133b347e;p=plcapi.git

diff --git a/Makefile b/Makefile
index e038082..ef55346 100644
--- a/Makefile
+++ b/Makefile
@@ -73,9 +73,9 @@ endif
 endif
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude Accessors_site.py
-RSYNC_EXCLUDES		:= --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+RSYNC_EXCLUDES		:= --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
-RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
+RSYNC			:= rsync -ai $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
 sync:
 ifeq (,$(SSHURL))
@@ -84,12 +84,11 @@ ifeq (,$(SSHURL))
 	@echo "  make sync PLCHOSTLXC=.. GUESTHOSTNAME=.. GUESTNAME=.."
 	@exit 1
 else
-	+$(RSYNC) plcsh PLC planetlab5.sql migrations aspects $(SSHURL)/usr/share/plc_api/
+	+$(RSYNC) plcsh PLC planetlab5.sql migrations $(SSHURL)/usr/share/plc_api/
 	+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
 	+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
 	+$(RSYNC) apache/plc.wsgi $(SSHURL)/usr/share/plc_api/apache/
-	$(SSHCOMMAND) /etc/plc.d/httpd stop
-	$(SSHCOMMAND) /etc/plc.d/httpd start
+	$(SSHCOMMAND) "/etc/plc.d/httpd stop; /etc/plc.d/httpd start"
 endif
 
 #################### convenience, for debugging only