summaryrefslogtreecommitdiffstats
path: root/docs/manual
diff options
context:
space:
mode:
Diffstat (limited to 'docs/manual')
-rw-r--r--docs/manual/adding-packages-autotools.txt4
-rw-r--r--docs/manual/adding-packages-cmake.txt4
-rw-r--r--docs/manual/adding-packages-perl.txt2
-rw-r--r--docs/manual/writing-rules.txt8
4 files changed, 9 insertions, 9 deletions
diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index 526b216581..1a59de3d6e 100644
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -22,7 +22,7 @@ package, with an example :
09: LIBFOO_SITE = http://www.foosoftware.org/download
10: LIBFOO_INSTALL_STAGING = YES
11: LIBFOO_INSTALL_TARGET = NO
-12: LIBFOO_CONF_OPT = --disable-shared
+12: LIBFOO_CONF_OPTS = --disable-shared
13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
14:
15: $(eval $(autotools-package))
@@ -96,7 +96,7 @@ cases, typical packages will therefore only use a few of them.
* +LIBFOO_CONF_ENV+, to specify additional environment
variables to pass to the configure script. By default, empty.
-* +LIBFOO_CONF_OPT+, to specify additional configure
+* +LIBFOO_CONF_OPTS+, to specify additional configure
options to pass to the configure script. By default, empty.
* +LIBFOO_MAKE+, to specify an alternate +make+
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index b8f30965ef..d5a70293f0 100644
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -22,7 +22,7 @@ with an example :
09: LIBFOO_SITE = http://www.foosoftware.org/download
10: LIBFOO_INSTALL_STAGING = YES
11: LIBFOO_INSTALL_TARGET = NO
-12: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON
+12: LIBFOO_CONF_OPTS = -DBUILD_DEMOS=ON
13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
14:
15: $(eval $(cmake-package))
@@ -94,7 +94,7 @@ typical packages will therefore only use a few of them.
* +LIBFOO_CONF_ENV+, to specify additional environment variables to
pass to CMake. By default, empty.
-* +LIBFOO_CONF_OPT+, to specify additional configure options to pass
+* +LIBFOO_CONF_OPTS+, to specify additional configure options to pass
to CMake. By default, empty.
* +LIBFOO_MAKE+, to specify an alternate +make+ command. This is
diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
index dedadbe341..6c44f98afb 100644
--- a/docs/manual/adding-packages-perl.txt
+++ b/docs/manual/adding-packages-perl.txt
@@ -101,7 +101,7 @@ cases, typical packages will therefore only use a few of them.
environment variables to pass to the +perl Makefile.PL+ or +perl Build.PL+.
By default, empty.
-* +PERL_FOO_CONF_OPT+/+HOST_PERL_FOO_CONF_OPT+, to specify additional
+* +PERL_FOO_CONF_OPTS+/+HOST_PERL_FOO_CONF_OPTS+, to specify additional
configure options to pass to the +perl Makefile.PL+ or +perl Build.PL+.
By default, empty.
diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt
index 757e1c6c20..e6401a4882 100644
--- a/docs/manual/writing-rules.txt
+++ b/docs/manual/writing-rules.txt
@@ -65,7 +65,7 @@ blank line is mandatory after the header:
+
---------------------
LIBFOO_VERSION = 1.0
-LIBFOO_CONF_OPT += --without-python-support
+LIBFOO_CONF_OPTS += --without-python-support
---------------------
+
Do not align the +=+ signs.
@@ -90,17 +90,17 @@ YES:
+
---------------------
ifeq ($(BR2_PACKAGE_PYTHON),y)
-LIBFOO_CONF_OPT += --with-python-support
+LIBFOO_CONF_OPTS += --with-python-support
LIBFOO_DEPENDENCIES += python
else
-LIBFOO_CONF_OPT += --without-python-support
+LIBFOO_CONF_OPTS += --without-python-support
endif
---------------------
+
NO:
+
---------------------
-LIBFOO_CONF_OPT += --with$(if $(BR2_PACKAGE_PYTHON),,out)-python-support
+LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON),,out)-python-support
LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,)
---------------------
OpenPOWER on IntegriCloud