an attempt to fix mtail that had mixed tabs and spaces

[myplc.git] / Makefile

diff --git a/Makefile b/Makefile
index 0b57cd1..dc89c4c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,10 +20,10 @@ SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)/
 SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
 endif
 
-LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc' 
-RSYNC_EXCLUDES         := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+LOCAL_RSYNC_EXCLUDES   := --exclude '*.pyc'
+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))
@@ -33,13 +33,14 @@ ifeq (,$(SSHURL))
        @echo "  make sync PLCHOSTLXC=.. GUESTNAME=.. GUESTHOSTNAME=.."
        @exit 1
 else
-       +$(RSYNC) plc.init $(SSHURL)/etc/init.d/plc
+       +$(RSYNC) systemd/plc-ctl $(SSHURL)/usr/bin/plc-ctl
+       +$(RSYNC) systemd/plc.service $(SSHURL)/usr/lib/systemd/system/plc.service
        +$(RSYNC) bin/ $(SSHURL)/usr/bin/
        +$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
        +$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
-       +$(RSYNC) plc_config.py $(SSHURL)/usr/lib\*/python2.\*/site-packages/plc_config.py
+       +$(RSYNC) plc_config.py $(SSHURL)/usr/lib\*/python3.\*/site-packages/plc_config.py
        +$(RSYNC) default_config.xml $(SSHURL)/etc/planetlab/default_config.xml
-       @echo XXXXXXXX you might need to run $(SSHCOMMAND) service plc start 
+       @echo XXXXXXXX you might need to run $(SSHCOMMAND) service plc start
 endif
 
 #################### convenience, for debugging only
@@ -51,4 +52,3 @@ endif
 +%: varname=$(subst +,,$@)
 +%:
        @echo "$($(varname))"
-