summaryrefslogtreecommitdiff
path: root/pre-inst-env.in
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-10-27 22:30:42 +0200
committerLudovic Courtès <ludo@gnu.org>2012-10-27 22:30:42 +0200
commita9f60c421bc6e4ad622d46102617fef9d3a290c6 (patch)
tree4a11b3fd663a540e49640a38695006cb5f4de559 /pre-inst-env.in
parentcc9abfd0f451652be4d08874a8f5b25f026fd44e (diff)
distro: Change $DISTRO_{PATCH,BOOTSTRAP}_DIRECTORY to search paths.
* distro.scm (not-colon): New variable. (%patch-directory): Rename to... (%patch-path): ... this. Turn into a list. Expect $DISTRO_PATCH_PATH to be a colon-separated search path. (%bootstrap-binaries-directory): Rename to... (%bootstrap-binaries-path): ... this. Likewise. (search-patch, search-bootstrap-binary): Adjust accordingly. * pre-inst-env.in: Change to use `DISTRO_PATCH_PATH' and `DISTRO_BOOTSTRAP_PATH'.
Diffstat (limited to 'pre-inst-env.in')
-rw-r--r--pre-inst-env.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/pre-inst-env.in b/pre-inst-env.in
index baea6da35a..0d1ca80b55 100644
--- a/pre-inst-env.in
+++ b/pre-inst-env.in
@@ -23,12 +23,12 @@
# Run COMMAND in a pre-installation environment. Typical use is
# "./pre-inst-env guix-build hello".
-DISTRO_PATCH_DIRECTORY="@abs_top_srcdir@/distro/packages/patches"
-DISTRO_BOOTSTRAP_DIRECTORY="@abs_top_srcdir@/distro/packages/bootstrap"
+DISTRO_PATCH_PATH="@abs_top_srcdir@/distro/packages/patches"
+DISTRO_BOOTSTRAP_PATH="@abs_top_srcdir@/distro/packages/bootstrap"
GUILE_LOAD_COMPILED_PATH="@abs_top_builddir@${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH"
GUILE_LOAD_PATH="@abs_top_srcdir@${GUILE_LOAD_PATH:+:}:$GUILE_LOAD_PATH"
-export DISTRO_PATCH_DIRECTORY DISTRO_BOOTSTRAP_DIRECTORY
+export DISTRO_PATCH_PATH DISTRO_BOOTSTRAP_PATH
export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH
# Define $PATH so that `guix-build' and friends are easily found.