From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 5 May 2022 19:20:52 +0000 (+0100)
Subject: Makefile, make-release: Publish to unreleased/docs/ by default
X-Git-Tag: otter-1.1.0~269
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=906e1416633acb016c87db99c66a1a4b8ce46f66;p=otter.git

Makefile, make-release: Publish to unreleased/docs/ by default

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

diff --git a/Makefile b/Makefile
index 46353057..3e855941 100644
--- a/Makefile
+++ b/Makefile
@@ -466,8 +466,9 @@ stamp/wdt-%.lcheck:	$(WDT_DEPS)
 
 #---------- docs publication ----------
 
+PUBLISH_VERSION=unreleased
 PUBLISH_USER=ianmdlvl@login.chiark.greenend.org.uk
-PUBLISH_DOC_SPHINX=$(PUBLISH_USER):public-html/otter/docs
+PUBLISH_DOC_SPHINX=$(PUBLISH_USER):public-html/otter/$(PUBLISH_VERSION)/docs
 
 publish: doc-sphinx
 	rsync -r --delete-delay docs/html/. $(PUBLISH_DOC_SPHINX)/.
diff --git a/make-release b/make-release
index 98dfc231..1a8776ba 100755
--- a/make-release
+++ b/make-release
@@ -102,7 +102,7 @@ $dryrun git push origin $branch
 
 #---------- non-idempotent things ----------
 
-$dryrun make -j12 publish
+$dryrun make -j12 PUBLISH_VERSION=$version publish
 
 $dryrun git tag -s -u "$keyid" -m "Otter v$version" $tag
 $dryrun git push chiark $tag