diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-11-25 11:34:32 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-11-25 11:34:35 +0000 |
| commit | 2f24e3855bc00dcc99fca525bcbf54ca58bcfdf3 (patch) | |
| tree | bef842d39fd4357566515b6c082e681c1a792ee6 /Makefile | |
| parent | bc69e7a5d8776fba256dda25e221b2230bdc4762 (diff) | |
| parent | 9cf4fa2fb8275b720b53511b43cce329ff90fac9 (diff) | |
Merge remote branch 'danni/rsync-trivia'
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -5,6 +5,8 @@ GZIP = gzip TAR = tar PYTHON = python +DOC_RSYNC_FLAGS=-rvzPp --chmod=Dg+s,ug+rwX,o=rX --delete + XMLS = $(wildcard spec/*.xml) TEMPLATES = $(wildcard doc/templates/*) @@ -52,7 +54,7 @@ clean: maintainer-upload-snapshot: doc/spec/index.html @install -d tmp - rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX doc/spec/ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/spec-snapshot/ + rsync $(DOC_RSYNC_FLAGS) doc/spec/ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/spec-snapshot/ @echo The snapshot lives at: @echo ' ' http://telepathy.freedesktop.org/spec-snapshot/ @@ -69,8 +71,8 @@ maintainer-upload-release: doc/spec/index.html check gpg --verify telepathy-spec-$$version.tar.gz.asc; \ rsync -vzP telepathy-spec-$$version.tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/telepathy-spec/ ; \ rsync -vzP telepathy-spec-$$version.tar.gz.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/telepathy-spec/ ; \ - rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX doc/spec/ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/spec/ ; \ - rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX doc/spec/ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/spec-snapshot/ + rsync $(DOC_RSYNC_FLAGS) doc/spec/ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/spec/ ; \ + rsync $(DOC_RSYNC_FLAGS) doc/spec/ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/spec-snapshot/ dist: check @install -d tmp @@ -94,7 +96,7 @@ UPLOAD_BRANCH_TO = people.freedesktop.org:public_html/telepathy-spec # Usage: make upload-branch BRANCH=discussion upload-branch: all - rsync -rzvP doc/spec \ + rsync -rzvP --delete doc/spec \ $(UPLOAD_BRANCH_TO)-$(BRANCH)/ @echo Your spec branch might be at: @echo ' ' http://people.freedesktop.org/~$$USER/telepathy-spec-$(BRANCH)/spec/ |