From df7cd39e8ca7a3d52d5d448c05d20f7b01443b69 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 23 Feb 2015 19:02:46 +0100 Subject: [PATCH] change in convenience targets sync-* in Makefile --- Makefile | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 69725db5..80d49c4c 100644 --- a/Makefile +++ b/Makefile @@ -110,8 +110,9 @@ ftags: force #################### sync : push current code on a box running myslice # this for now targets deployments based on the debian packaging -SSHURL:=root@$(MYSLICEBOX):/ -SSHCOMMAND:=ssh root@$(MYSLICEBOX) +SSHUSER ?= root +SSHURL := $(SSHUSER)@$(MYSLICEBOX): +SSHCOMMAND := ssh $(SSHUSER)@$(MYSLICEBOX) ### rsync options # the config file should probably not be overridden ?? @@ -163,3 +164,14 @@ ifeq (,$(MYSLICEBOX)) else +$(SSHCOMMAND) apachectl restart endif + +#SSHUSER=tparment +#MYSLICEBOX=srv-diana.inria.fr +sync-devel: +ifeq (,$(MYSLICEBOX)) + @echo "you need to set MYSLICEBOX, like in e.g." + @echo " $(MAKE) MYSLICEBOX=srv-diana.inria.fr "$@"" + @exit 1 +else + +$(RSYNC) --relative $$(git ls-files) $(SSHURL)myslice/ +endif -- 2.43.0