diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-11-25 16:28:52 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-11-25 16:28:52 +0100 |
| commit | 0b3651bc9321c7292e0409384a8e9aaa82b1e057 (patch) | |
| tree | 17a94771359002ec7920013f9dfb2af5e7fb838d /pre-inst-env.in | |
| parent | fe7777c14b7d5779287acca452dc70e50b026f0c (diff) | |
| download | gnu-guix-0b3651bc9321c7292e0409384a8e9aaa82b1e057.tar gnu-guix-0b3651bc9321c7292e0409384a8e9aaa82b1e057.tar.gz | |
distro: Search bootstrap binaries and patches in %LOAD-PATH.
* Makefile.am (patchdir, bootstrapdir): Change to be sub-directories of
$(guilemoduledir).
(.scm.go): Remove `DISTRO_' environment variables.
* distro.scm (not-colon): Remove.
(%patch-path, %bootstrap-binaries-path): Default to sub-directories of
the entries in %LOAD-PATH.
* pre-inst-env.in: Remove definition of `DISTRO_' environment variables.
Diffstat (limited to 'pre-inst-env.in')
| -rw-r--r-- | pre-inst-env.in | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pre-inst-env.in b/pre-inst-env.in index d90934c184..e85291f948 100644 --- a/pre-inst-env.in +++ b/pre-inst-env.in @@ -23,12 +23,8 @@ # Run COMMAND in a pre-installation environment. Typical use is # "./pre-inst-env guix-build hello". -DISTRO_PATCH_PATH="@abs_top_srcdir@/distro/packages/patches" -DISTRO_BOOTSTRAP_PATH="@abs_top_srcdir@/distro/packages/bootstrap:@abs_top_builddir@/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_PATH DISTRO_BOOTSTRAP_PATH +GUILE_LOAD_PATH="@abs_top_builddir@:@abs_top_srcdir@${GUILE_LOAD_PATH:+:}:$GUILE_LOAD_PATH" export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH # Define $PATH so that `guix-build' and friends are easily found. |