From 127d3f2965db2f4fad12bfabeeec9370f0972e92 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Wed, 27 Jan 2021 22:22:48 -0600 Subject: [PATCH] build: remove generate target, split run out This ensures that `make all` will never try to run the internal server. Instead, the user can run it manually if they need to. Reviewed-by: gjb, hrs Differential-Revision: https://reviews.freebsd.org/D28384 --- documentation/Makefile | 12 +++++++++--- website/Makefile | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/documentation/Makefile b/documentation/Makefile index a09a995c11..c26485e6e1 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -6,7 +6,12 @@ # Targets intended for use on the command line # # all (default) - generate the books TOC and compile all the documentation -# generate - generate the books TOC and build all the documentation +# run - serves the built documentation site for local browsing +# +# The run target uses hugo's built-in webserver to make the documentation site +# available for local browsing. The documentation should have been built prior +# to attempting to use the `run` target. By default, hugo will start its +# webserver on port 1313. MAINTAINER=carlavilla@FreeBSD.org @@ -14,12 +19,13 @@ PYTHON_CMD = /usr/local/bin/python3.7 HUGO_CMD = /usr/local/bin/hugo LANGUAGES = en,es,pt-br,de,ja,zh-cn,zh-tw,ru,el,hu,it,mn,nl,pl,fr +.ORDER: all run + .ORDER: starting-message generate-books-toc .ORDER: starting-message build .ORDER: generate-books-toc build -all: starting-message generate-books-toc run -generate: starting-message generate-books-toc build .PHONY +all: starting-message generate-books-toc build starting-message: .PHONY @echo --------------------------------------------------------------- diff --git a/website/Makefile b/website/Makefile index 85b00f6df8..c6ea6d6cef 100644 --- a/website/Makefile +++ b/website/Makefile @@ -6,19 +6,25 @@ # Targets intended for use on the command line # # all (default) - generate the releases.toml and compile all the website -# generate - generate the releases.toml and build all the website +# run - serves the built website for local browsing +# +# The run target uses hugo's built-in webserver to make the built website +# available for local browsing. The website should have been built prior +# to attempting to use the `run` target. By default, hugo will start its +# webserver on port 1313. MAINTAINER=carlavilla@FreeBSD.org PYTHON_CMD = /usr/local/bin/python3.7 HUGO_CMD = /usr/local/bin/hugo +.ORDER: all run + .ORDER: starting-message generate-books-toc .ORDER: starting-message build .ORDER: generate-books-toc build -all: starting-message generate-releases run -generate: starting-message generate-releases build .PHONY +all: starting-message generate-releases build starting-message: .PHONY @echo ---------------------------------------------------------------