diff --git a/make/dav.mk b/make/dav.mk index 0148286d..8008ede5 100644 --- a/make/dav.mk +++ b/make/dav.mk @@ -3,9 +3,10 @@ DAV_GROUP_PROJECT ?= $(PROJECT_DIRNAME) DAV_GROUP_PROJECT_GROUP ?= $(shell id -gn) DAV_GROUP_PROJECT_USER ?= $(shell id -un) DAV_SERVER ?= cvs.jannet.de +DAV_RSYNC_SERVER ?= $(DAV_SERVER) DAV_RSYNC_DIR ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJECT) -DAV_RSYNC_URL = $(DAV_SERVER):$(DAV_RSYNC_DIR) -DAV_RSYNC_EXCLUDE ?= Makefile +DAV_RSYNC_URL = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR) +DAV_RSYNC_EXCLUDE ?= $(shell bash $(MOD_SCRIPT_DIR)/list-cvs-files.sh) DAV_RSYNC_EXCLUDE_OPTS = $(addprefix --exclude , $(DAV_RSYNC_EXCLUDE)) DAV_RSYNC_EXTRA_OPTS ?= DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS) @@ -21,9 +22,18 @@ distclean: dav.clean upload: upload.done dload download: dload.done +delete-remote: + ssh $(DAV_RSYNC_SERVER) rm -rf $(DAV_RSYNC_DIR) upload.done: - $(DAV_RSYNC) --chmod F$(DAV_RSYNC_MODE) --chmod D$(DAV_RSYNC_DIRMODE) --chown $(DAV_GROUP_PROJECT_USER):$(DAV_GROUP_PROJECT_GROUP) -av ./ $(DAV_RSYNC_URL)/ + $(DAV_RSYNC) \ + --chmod F$(DAV_RSYNC_MODE) \ + --chmod D$(DAV_RSYNC_DIRMODE) \ + --chown $(DAV_GROUP_PROJECT_USER):$(DAV_GROUP_PROJECT_GROUP) \ + -av \ + $(DAV_RSYNC_EXTRA_OPTS) \ + ./ \ + $(DAV_RSYNC_URL)/ touch $@ dload.done: