diff options
| -rw-r--r-- | etc/README.md | 24 | ||||
| -rw-r--r-- | subr.ex/ex_pkg.subr | 2 | ||||
| -rw-r--r-- | vars.env.d/000.build.env (renamed from env.d/000.build.env) | 0 | ||||
| -rw-r--r-- | vars.env.d/050.pathsvars.env (renamed from env.d/050.pathsvars.env) | 0 | ||||
| -rw-r--r-- | vars.env.d/100.toolchain.env (renamed from env.d/100.toolchain.env) | 0 | ||||
| -rw-r--r-- | vars.env.d/100.tools.env (renamed from env.d/100.tools.env) | 0 | ||||
| -rw-r--r-- | vars.env.d/200.targets.env (renamed from env.d/200.targets.env) | 0 | ||||
| -rw-r--r-- | vars.env.d/300.config.cache.env (renamed from env.d/300.config.cache.env) | 0 | ||||
| -rw-r--r-- | vars.env.d/300.config.cache.gnulib.env (renamed from env.d/300.config.cache.gnulib.env) | 0 |
9 files changed, 13 insertions, 13 deletions
diff --git a/etc/README.md b/etc/README.md index 40ce884f..90ec4bd3 100644 --- a/etc/README.md +++ b/etc/README.md @@ -459,7 +459,7 @@ package build completion corresponds to the pseudo-build step ``finish``. [//]: # "{{{ 4.2. Build variables"
## 4.2. Build variables
-The following variables are primarily defined in ``env.d/*.env`` and may be
+The following variables are primarily defined in ``vars.env.d/*.env`` and may be
overriden on a per-build basis on the command-line, the environment, and/or
``${HOME}/midipix_build.vars``, ``${HOME}/.midipix_build.vars``, and/or
``../midipix_build.vars``, e.g.:
@@ -660,21 +660,21 @@ usage: rtl_install [-i] [-I ifs] [-n] [-p name=val] [-v] prefix spec_list ### 4.4. Package variables
The following variables are package-specific and receive their value from either
-top-level defaults defined in ``env.d/*.env``, build group-specific defaults from the
+top-level defaults defined in ``vars.env.d/*.env``, build group-specific defaults from the
build group the package pertains to and defined in its corresponding file beneath
``groups.d/``, or package-specific overrides defined either in the latter and/or in its
corresponding file beneath ``vars/``, with one of the following prefixes:
-| Variable name prefix |
-| ----------------------------------------------------- |
-| DEFAULT |
-| DEFAULT_``${BUILD_TYPE}`` |
-| DEFAULT_``${GROUP_NAME}`` |
-| ``${GROUP_NAME}`` |
-| [PKG_``${RELATED_PACKAGE(S)}``] |
-| [PKG_``${RELATED_PACKAGE(S)}``_``${BUILD_KIND}``] |
-| PKG_``${NAME}`` |
-| PKG_``${NAME}``_``${BUILD_KIND}`` |
+| Variable name prefix |
+| ------------------------------------------------- |
+| DEFAULT |
+| DEFAULT_``${BUILD_TYPE}`` |
+| DEFAULT_``${GROUP_NAME}`` |
+| ``${GROUP_NAME}`` |
+| [PKG_``${RELATED_PACKAGE(S)}``] |
+| [PKG_``${RELATED_PACKAGE(S)}``_``${BUILD_KIND}``] |
+| PKG_``${NAME}`` |
+| PKG_``${NAME}``_``${BUILD_KIND}`` |
Additionally, overrides may be specified on a per-build basis on the command-
line, with each variable prefixed w/ ``PKG_``, e.g.:
diff --git a/subr.ex/ex_pkg.subr b/subr.ex/ex_pkg.subr index eca8914a..c914360e 100644 --- a/subr.ex/ex_pkg.subr +++ b/subr.ex/ex_pkg.subr @@ -228,7 +228,7 @@ ex_pkg_load_vars() { set +o noglob; for _eplv_fname in \ - ./env.d/*.env; + ./vars.env.d/*.env; do set -o noglob; if [ -r "${_eplv_fname}" ]; then diff --git a/env.d/000.build.env b/vars.env.d/000.build.env index e4a08d1f..e4a08d1f 100644 --- a/env.d/000.build.env +++ b/vars.env.d/000.build.env diff --git a/env.d/050.pathsvars.env b/vars.env.d/050.pathsvars.env index d4f7ca6b..d4f7ca6b 100644 --- a/env.d/050.pathsvars.env +++ b/vars.env.d/050.pathsvars.env diff --git a/env.d/100.toolchain.env b/vars.env.d/100.toolchain.env index 36509404..36509404 100644 --- a/env.d/100.toolchain.env +++ b/vars.env.d/100.toolchain.env diff --git a/env.d/100.tools.env b/vars.env.d/100.tools.env index e3e249c8..e3e249c8 100644 --- a/env.d/100.tools.env +++ b/vars.env.d/100.tools.env diff --git a/env.d/200.targets.env b/vars.env.d/200.targets.env index 48a70f3c..48a70f3c 100644 --- a/env.d/200.targets.env +++ b/vars.env.d/200.targets.env diff --git a/env.d/300.config.cache.env b/vars.env.d/300.config.cache.env index d46e593f..d46e593f 100644 --- a/env.d/300.config.cache.env +++ b/vars.env.d/300.config.cache.env diff --git a/env.d/300.config.cache.gnulib.env b/vars.env.d/300.config.cache.gnulib.env index 7ebd89e1..7ebd89e1 100644 --- a/env.d/300.config.cache.gnulib.env +++ b/vars.env.d/300.config.cache.gnulib.env |