summaryrefslogtreecommitdiffstats
path: root/docs/manual
diff options
context:
space:
mode:
authorThomas De Schampheleire <patrickdepinguin@gmail.com>2014-09-27 21:32:38 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-04 15:07:23 +0200
commit0518a98ac3e715a846dfb72fcfb2ec7aed423084 (patch)
treeff1b926c857b43bedc1d6eb96c149d5a026e8e6a /docs/manual
parentbe47b84c1a5604e3f1bf831b011c6717a2900282 (diff)
packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS
While the autotools infrastructure was using FOO_MAKE_OPT, generic packages were typically using FOO_MAKE_OPTS. This inconsistency becomes a problem when a new infrastructure is introduced that wants to make use of FOO_MAKE_OPT(S), and can live alongside either generic-package or autotools-package. The new infrastructure will have to choose between either OPT or OPTS, and thus rule out transparent usage by respectively generic packages or generic packages. An example of such an infrastructure is kconfig-package, which provides kconfig-related make targets. The OPTS variant is more logical, as there are typically multiple options. This patch renames all occurrences of FOO_MAKE_OPT in FOO_MAKE_OPTS. Sed command used: find * -type f | xargs sed -i 's#_MAKE_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'docs/manual')
-rw-r--r--docs/manual/adding-packages-autotools.txt2
-rw-r--r--docs/manual/adding-packages-cmake.txt2
-rw-r--r--docs/manual/adding-packages-kconfig.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index 4329ca7ce..9fb765fe1 100644
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -111,7 +111,7 @@ cases, typical packages will therefore only use a few of them.
variables to pass to make in the build step. These are passed before
the +make+ command. By default, empty.
-* +LIBFOO_MAKE_OPT+, to specify additional variables to
+* +LIBFOO_MAKE_OPTS+, to specify additional variables to
pass to make in the build step. These are passed after the
+make+ command. By default, empty.
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index d648fee35..828fc345c 100644
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -108,7 +108,7 @@ typical packages will therefore only use a few of them.
pass to make in the build step. These are passed before the +make+
command. By default, empty.
-* +LIBFOO_MAKE_OPT+, to specify additional variables to pass to make
+* +LIBFOO_MAKE_OPTS+, to specify additional variables to pass to make
in the build step. These are passed after the +make+ command. By
default, empty.
diff --git a/docs/manual/adding-packages-kconfig.txt b/docs/manual/adding-packages-kconfig.txt
index f14b87b9d..979a2b5f5 100644
--- a/docs/manual/adding-packages-kconfig.txt
+++ b/docs/manual/adding-packages-kconfig.txt
@@ -47,7 +47,7 @@ be set to suit the needs of the package under consideration:
support, for example 'menuconfig xconfig'. By default, 'menuconfig'.
* +FOO_KCONFIG_OPT+: extra options to pass when calling the kconfig
- ediftors. This may need to include '$(FOO_MAKE_OPT)', for example. By
+ editors. This may need to include '$(FOO_MAKE_OPTS)', for example. By
default, empty.
* +FOO_KCONFIG_FIXUP_CMDS+: a list of shell commands needed to fixup the