build: Move distro/patches' to distro/packages/patches'.

* distro/patches: Move directory to...
* distro/packages/patches: ... here.
* Makefile.am (dist_patch_DATA): Adjust accordingly.
* pre-inst-env.in (DISTRO_PATCH_DIRECTORY): Likewise.
This commit is contained in:
Ludovic Courtès 2012-10-27 15:30:08 +02:00
parent fc2f38023b
commit bfb3c3d03a
16 changed files with 16 additions and 16 deletions

View file

@ -48,21 +48,21 @@ GOBJECTS = $(MODULES:%.scm=%.go)
nobase_dist_guilemodule_DATA = $(MODULES)
patchdir = $(pkgdatadir)/patches
dist_patch_DATA = \
distro/patches/binutils-ld-new-dtags.patch \
distro/patches/diffutils-gets-undeclared.patch \
distro/patches/guile-1.8-cpp-4.5.patch \
distro/patches/guile-default-utf8.patch \
distro/patches/guile-relocatable.patch \
distro/patches/libtool-skip-tests.patch \
distro/patches/m4-gets-undeclared.patch \
distro/patches/m4-readlink-EINVAL.patch \
distro/patches/m4-s_isdir.patch \
distro/patches/make-impure-dirs.patch \
distro/patches/findutils-absolute-paths.patch \
distro/patches/perl-no-sys-dirs.patch \
distro/patches/readline-link-ncurses.patch \
distro/patches/tar-gets-undeclared.patch
dist_patch_DATA = \
distro/packages/patches/binutils-ld-new-dtags.patch \
distro/packages/patches/diffutils-gets-undeclared.patch \
distro/packages/patches/guile-1.8-cpp-4.5.patch \
distro/packages/patches/guile-default-utf8.patch \
distro/packages/patches/guile-relocatable.patch \
distro/packages/patches/libtool-skip-tests.patch \
distro/packages/patches/m4-gets-undeclared.patch \
distro/packages/patches/m4-readlink-EINVAL.patch \
distro/packages/patches/m4-s_isdir.patch \
distro/packages/patches/make-impure-dirs.patch \
distro/packages/patches/findutils-absolute-paths.patch \
distro/packages/patches/perl-no-sys-dirs.patch \
distro/packages/patches/readline-link-ncurses.patch \
distro/packages/patches/tar-gets-undeclared.patch
bootstrapdir = $(pkgdatadir)/bootstrap
bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux

View file

@ -23,7 +23,7 @@
# Run COMMAND in a pre-installation environment. Typical use is
# "./pre-inst-env guix-build hello".
DISTRO_PATCH_DIRECTORY="@abs_top_srcdir@/distro/patches"
DISTRO_PATCH_DIRECTORY="@abs_top_srcdir@/distro/packages/patches"
DISTRO_BOOTSTRAP_DIRECTORY="@abs_top_srcdir@/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"