Makefile, make-release: Make published version current

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Makefile b/Makefile
index 82afb902c23242bc7e1445eabb92dd90e8fcdee8..e324437498a0979a2b441d5f884f1b1297db274a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -477,6 +477,9 @@ publish: doc-sphinx
        rsync -r --delete-delay docs/html/. $(PUBLISH_DOC_SPHINX)/.
        git branch -f $(PUBLISHED_BRANCH)
 
+publish-make-current:
+       ssh $(PUBLISH_USER) 'set -e; cd $(PUBLISH_DOC_SPHINX_BASE); rm -f current.tmp; ln -s $(PUBLISH_VERSION) current.tmp; mv -T current.tmp current'
+
 #---------- deployment ----------
 
 DEPLOY_USER=ian@login.chiark.greenend.org.uk

diff --git a/make-release b/make-release
index 1a8776badcdf0a9cec505c9c298100fc154e442f..49525e19d3073f14580b33b4052a4c427cc8dc8d 100755 (executable)
--- a/make-release
+++ b/make-release
@@ -103,6 +103,7 @@ $dryrun git push origin $branch
 #---------- non-idempotent things ----------
 
 $dryrun make -j12 PUBLISH_VERSION=$version publish
+$dryrun make -j12 PUBLISH_VERSION=$version publish-make-current
 
 $dryrun git tag -s -u "$keyid" -m "Otter v$version" $tag
 $dryrun git push chiark $tag