From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 10 Jun 2021 12:46:17 +0000 (+0100)
Subject: docs: Refer to new sphinx docs, not gone shapelib toml rustdoc
X-Git-Tag: otter-0.7.1~11
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4af3aee3405374d4d113088bfb858ced050fdfaf;p=otter.git

docs: Refer to new sphinx docs, not gone shapelib toml rustdoc

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

diff --git a/Makefile b/Makefile
index 8f9d48bf..cce4386c 100644
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,9 @@ full-check: all check cargo-syntaxcheck-release shapelib doc-sphinx
 full-check: for-deploy release
 everything: debug doc release check bundled-sources
 
-shapelib: templates/shapelib.html stamp/cargo.doc-otter-only
+shapelib: templates/shapelib.html docs/html/index.html
 	@echo 'Shape library preview and docs can now be found here:'
-	@echo '  file://$(PWD)/$<'
-	@echo '  file://$(abspath $(TARGET_DIR)/doc/otter/shapelib_toml/index.html)'
+	@for f in $^; do echo '  file://$(PWD)/'$$f; done
 
 MAKEFILE_DEP ?= Makefile
 MAKEFILE_FIND_X ?=
@@ -222,10 +221,6 @@ stamp/cargo.doc: $(call rsrcs,.)
 	$(CARGO) doc $(CARGO_DOC_OPTS) --workspace 2>&1 |egrep -vf .cargo-doc-suppress-errors
 	$(stamp)
 
-stamp/cargo.doc-otter-only: $(call rsrcs,.)
-	$(CARGO) doc $(CARGO_DOC_OPTS) --workspace -p otter --no-deps
-	$(stamp)
-
 $(addprefix stamp/cargo.wasm-,$(DR)):: \
 stamp/cargo.wasm-%: $(call rsrcs, base wasm Cargo.*)
 	$(CARGO) build --target $(WASM) -p otter-wasm $(call cr,$*)