build: Add $(top_builddir) to the load path.

* Makefile.am (DOWNLOAD_FILE): Add $(top_builddir) to the search path,
  since that's where guix/config.scm is.
  (.scm.go): Likewise.
This commit is contained in:
Ludovic Courtès 2012-11-13 00:33:43 +01:00
parent 25608d640a
commit 671d8f5e6f

View file

@ -124,7 +124,7 @@ DISTCLEANFILES = \
# Method to download a file from an external source. # Method to download a file from an external source.
DOWNLOAD_FILE = \ DOWNLOAD_FILE = \
GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \ GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \
$(GUILE) --no-auto-compile -L "$(top_srcdir)" \ $(GUILE) --no-auto-compile -L "$(top_builddir)" -L "$(top_srcdir)" \
"$(top_srcdir)/build-aux/download.scm" "$(top_srcdir)/build-aux/download.scm"
distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz: distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz:
@ -175,7 +175,7 @@ CLEANFILES = $(GOBJECTS) *.log
DISTRO_INSTALLED_PATCH_DIRECTORY="$(patchdir)" \ DISTRO_INSTALLED_PATCH_DIRECTORY="$(patchdir)" \
DISTRO_INSTALLED_BOOTSTRAP_DIRECTORY="$(bootstrapdir)" \ DISTRO_INSTALLED_BOOTSTRAP_DIRECTORY="$(bootstrapdir)" \
$(top_builddir)/pre-inst-env \ $(top_builddir)/pre-inst-env \
$(GUILD) compile -L "$(top_srcdir)" \ $(GUILD) compile -L "$(top_builddir)" -L "$(top_srcdir)" \
-Wformat -Wunbound-variable -Warity-mismatch \ -Wformat -Wunbound-variable -Warity-mismatch \
--target="$(host)" \ --target="$(host)" \
-o "$@" "$<" -o "$@" "$<"