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 46353057feb33878ac0b34264b12f3206eaf8b4c..3e8559413d757cbdf8bad596243e90169dd3fea0 100644 (file)
--- 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 98dfc2315407ea3cfc1369e3eb19c6b6060b640f..1a8776badcdf0a9cec505c9c298100fc154e442f 100755 (executable)
--- 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