summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-10-27 22:37:49 +0200
committerLudovic Courtès <ludo@gnu.org>2012-10-27 22:37:49 +0200
commit735bb2af10edf4760d23e446b38e76c423bccca7 (patch)
treee075facde1d0da9ef28f1a83d7d87d877197250a
parenta9f60c421bc6e4ad622d46102617fef9d3a290c6 (diff)
build: Fix out-of-source-tree builds.
* Makefile.am (distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz, distro/packages/bootstrap/i686-linux/guile-bootstrap-2.0.6.tar.xz): Make the target's parent directory. * pre-inst-env.in (DISTRO_BOOTSTRAP_PATH): Add the builddir-relative directory.
-rw-r--r--Makefile.am2
-rw-r--r--pre-inst-env.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index d1f3547224..cf3e16bbc6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,8 +98,10 @@ DOWNLOAD_FILE = \
"$(top_srcdir)/build-aux/download.scm"
distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz: guix/utils.go
+ $(MKDIR_P) `dirname "$@"`
$(DOWNLOAD_FILE) "$@" "0467a82cbe4136f60a79eb4176011bf88cf28ea19c9ad9defa365811ff8e11cf"
distro/packages/bootstrap/i686-linux/guile-bootstrap-2.0.6.tar.xz: guix/utils.go
+ $(MKDIR_P) `dirname "$@"`
$(DOWNLOAD_FILE) "$@" "93b537766dfab3ad287143523751e3ec02dd32d3ccaf88ad2d31c63158f342ee"
nobase_nodist_guilemodule_DATA = $(GOBJECTS)
diff --git a/pre-inst-env.in b/pre-inst-env.in
index 0d1ca80b55..2fb60e2edd 100644
--- a/pre-inst-env.in
+++ b/pre-inst-env.in
@@ -24,7 +24,7 @@
# "./pre-inst-env guix-build hello".
DISTRO_PATCH_PATH="@abs_top_srcdir@/distro/packages/patches"
-DISTRO_BOOTSTRAP_PATH="@abs_top_srcdir@/distro/packages/bootstrap"
+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"