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 /Makefile.am | |
| parent | fe7777c14b7d5779287acca452dc70e50b026f0c (diff) | |
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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 3fc80edd61..571ad8eb15 100644 --- a/Makefile.am +++ b/Makefile.am @@ -87,7 +87,7 @@ GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go nobase_dist_guilemodule_DATA = $(MODULES) -patchdir = $(pkgdatadir)/patches +patchdir = $(guilemoduledir)/distro/packages/patches dist_patch_DATA = \ distro/packages/patches/binutils-ld-new-dtags.patch \ distro/packages/patches/diffutils-gets-undeclared.patch \ @@ -108,7 +108,7 @@ dist_patch_DATA = \ distro/packages/patches/shishi-gets-undeclared.patch \ distro/packages/patches/tar-gets-undeclared.patch -bootstrapdir = $(pkgdatadir)/bootstrap +bootstrapdir = $(guilemoduledir)/distro/packages/bootstrap bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux @@ -196,8 +196,6 @@ CLEANFILES = $(GOBJECTS) *.log .scm.go: $(MKDIR_P) `dirname "$@"` - DISTRO_INSTALLED_PATCH_DIRECTORY="$(patchdir)" \ - DISTRO_INSTALLED_BOOTSTRAP_DIRECTORY="$(bootstrapdir)" \ $(top_builddir)/pre-inst-env \ $(GUILD) compile -L "$(top_builddir)" -L "$(top_srcdir)" \ -Wformat -Wunbound-variable -Warity-mismatch \ |