From 0b3651bc9321c7292e0409384a8e9aaa82b1e057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 25 Nov 2012 16:28:52 +0100 Subject: 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. --- pre-inst-env.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'pre-inst-env.in') 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. -- cgit v1.2.3