From 8750cad4505afa3e6a21d2b52d89a8f6ab58a131 Mon Sep 17 00:00:00 2001 From: Yasuhiro Kimura Date: Tue, 16 Feb 2021 19:29:11 +0100 Subject: [PATCH] Makefiles and FDP: Change python binary Currently '/usr/local/bin/python3.7' is used as the value of PYTHON_CMD. Right now this works because 3.7 is the default version of Python 3 in the ports tree. However, at some point in the future, this will be undoubtedly be changed. It is also possible that users already might be building versions newer than the default port/package, which needs to be an supported as well. In addition, the FDP recommends installing the 'python3' package. This meta port/package depends on the default version of python, and automatically creates a symlink to the default version. With all this in mind, use '/usr/local/bin/python3' is used as the value of PYTHON_CMD, since this means that the instructions will work irrespective of which version is assigned. --- documentation/Makefile | 2 +- .../content/en/books/fdp-primer/doc-build/chapter.adoc | 4 ++-- website/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/Makefile b/documentation/Makefile index 3b5c1cfd65..4b594fcdca 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -15,7 +15,7 @@ MAINTAINER=carlavilla@FreeBSD.org -PYTHON_CMD = /usr/local/bin/python3.7 +PYTHON_CMD = /usr/local/bin/python3 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 diff --git a/documentation/content/en/books/fdp-primer/doc-build/chapter.adoc b/documentation/content/en/books/fdp-primer/doc-build/chapter.adoc index 1d938d89c6..81aaa9be2d 100644 --- a/documentation/content/en/books/fdp-primer/doc-build/chapter.adoc +++ b/documentation/content/en/books/fdp-primer/doc-build/chapter.adoc @@ -129,7 +129,7 @@ This [.filename]#Makefile# takes the following form: MAINTAINER=carlavilla@FreeBSD.org <.> -PYTHON_CMD = /usr/local/bin/python3.7 <.> +PYTHON_CMD = /usr/local/bin/python3 <.> 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 <.> @@ -195,7 +195,7 @@ This [.filename]#Makefile# takes the form of: MAINTAINER=carlavilla@FreeBSD.org <.> -PYTHON_CMD = /usr/local/bin/python3.7 <.> +PYTHON_CMD = /usr/local/bin/python3 <.> HUGO_CMD = /usr/local/bin/hugo <.> .ORDER: all run<.> diff --git a/website/Makefile b/website/Makefile index 2294db8838..4b32bf76d7 100644 --- a/website/Makefile +++ b/website/Makefile @@ -15,7 +15,7 @@ MAINTAINER=carlavilla@FreeBSD.org -PYTHON_CMD = /usr/local/bin/python3.7 +PYTHON_CMD = /usr/local/bin/python3 HUGO_CMD = /usr/local/bin/hugo .ifndef HOSTNAME